diff --git a/popt-1.18-ltname.patch b/popt-1.18-ltname.patch deleted file mode 100644 index 57dfa216c2c257d9d941e21ffcbcc5ceaebf2360..0000000000000000000000000000000000000000 --- a/popt-1.18-ltname.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up popt-1.18/tests/testit.sh.ltname popt-1.18/tests/testit.sh ---- popt-1.18/tests/testit.sh.ltname 2021-06-23 10:54:18.334525616 +0300 -+++ popt-1.18/tests/testit.sh 2021-06-23 10:54:28.330677496 +0300 -@@ -115,7 +115,7 @@ run test1 "test1 - 56" "arg1: 0 arg2: (n - run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar - - run test1 "test1 - 58" "\ --Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] -+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] - [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] - [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG] - [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE] -@@ -124,7 +124,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] - [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc] - [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage - run test1 "test1 - 59" "\ --Usage: lt-test1 [OPTION...] -+Usage: test1 [OPTION...] - --arg1 First argument with a really long - description. After all, we have to test - argument help wrapping somehow, right? diff --git a/popt-1.18.tar.gz b/popt-1.18.tar.gz deleted file mode 100644 index 0079e162c7420c4d996f615bdbbc47e878bddcca..0000000000000000000000000000000000000000 Binary files a/popt-1.18.tar.gz and /dev/null differ diff --git a/popt-1.19.tar.gz b/popt-1.19.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f89912807c7611ef9b3ac09e110e74b434043b0b Binary files /dev/null and b/popt-1.19.tar.gz differ diff --git a/popt.spec b/popt.spec index 3b2ad32fec92057e678d68a618658c07b800f9ce..c27e7f889c5b39513d7b053291493ba51509141d 100644 --- a/popt.spec +++ b/popt.spec @@ -1,16 +1,12 @@ %define anolis_release 1 -%define ver 1.18 -#define snap rc1 -%define srcver %{ver}%{?snap:-%{snap}} Summary: C library for parsing command line parameters Name: popt -Version: %{ver}%{?snap:~%{snap}} +Version: 1.19 Release: %{anolis_release}%{?dist} License: MIT URL: https://github.com/rpm-software-management/popt/ -Source0: http://ftp.rpm.org/popt/releases/popt-1.x/%{name}-%{srcver}.tar.gz -Patch0: popt-1.18-ltname.patch +Source0: http://ftp.rpm.org/popt/releases/popt-1.x/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: gettext BuildRequires: make @@ -27,17 +23,25 @@ shell-like rules. %package devel Summary: Development files for the popt library -Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig +Requires: %{name} = %{version}-%{release}, pkgconfig %description devel The popt-devel package includes header files and libraries necessary for developing programs which use the popt C library. It contains the API documentation of the popt library, too. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %if 0%{!?_without_static:1} %package static Summary: Static library for parsing command line parameters -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description static The popt-static package includes static libraries of the popt library. @@ -45,7 +49,7 @@ Install it if you need to link statically with libpopt. %endif %prep -%autosetup -n %{name}-%{srcver} -p1 +%autosetup -n %{name}-%{version} -p1 %build %configure %{?_without_static:--disable-static} @@ -69,12 +73,10 @@ make check || cat tests/*.log %files -f %{name}.lang %license COPYING -%doc CHANGES %{_sysconfdir}/popt.d/ %{_libdir}/libpopt.so.* %files devel -%doc README %{_libdir}/libpopt.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/popt.h @@ -85,6 +87,12 @@ make check || cat tests/*.log %{_libdir}/libpopt.a %endif +%files doc +%doc README + %changelog +* Wed Sep 21 2022 mgb01105731 - 1.19-1 +- update to 1.19 + * Wed Mar 08 2022 Renbo - 1.18-1 - Init for Anolis OS 23