From e5f6b7e2fb93dd5229db912208070970875e4cf5 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 10 Mar 2021 20:07:22 +0100 Subject: [PATCH] - updated to 1.18 (back from rpm.org) - updated diet patch - removed outdated alias-argc patch - added pl.po-update patch --- popt-alias-argc.patch | 11 ----------- popt-diet.patch | 17 ++++++++--------- popt-pl.po-update.patch | 20 ++++++++++++++++++++ popt.spec | 23 ++++++++++------------- 4 files changed, 38 insertions(+), 33 deletions(-) delete mode 100644 popt-alias-argc.patch create mode 100644 popt-pl.po-update.patch diff --git a/popt-alias-argc.patch b/popt-alias-argc.patch deleted file mode 100644 index 3b3c53b..0000000 --- a/popt-alias-argc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- popt-1.17/popt.c.orig 2014-08-09 22:13:11.000000000 +0200 -+++ popt-1.17/popt.c 2018-12-08 09:41:33.241167491 +0100 -@@ -1774,7 +1774,7 @@ - item->option.argDescrip = _free(item->option.argDescrip); - /*@=modobserver =observertrans =dependenttrans@*/ - #if !defined(SUPPORT_CONTIGUOUS_ARGV) -- for (i = 0; item->argv[i]; i++) -+ for (i = 0; (i < item->argc) && item->argv[i]; i++) - item->argv[i] = _free(item->argv[i]); - #endif - item->argv = _free(item->argv); diff --git a/popt-diet.patch b/popt-diet.patch index 96ba4ec..b2b95b3 100644 --- a/popt-diet.patch +++ b/popt-diet.patch @@ -1,13 +1,12 @@ ---- popt-1.14/popthelp.c~ 2008-03-27 18:33:08.000000000 +0100 -+++ popt-1.14/popthelp.c 2009-03-18 15:31:07.000000000 +0100 -@@ -22,6 +22,10 @@ - #endif - #include "poptint.h" - +--- popt-1.18/src/popthelp.c.orig 2021-03-10 19:12:18.753352430 +0100 ++++ popt-1.18/src/popthelp.c 2021-03-10 19:15:01.942468359 +0100 +@@ -13,6 +13,9 @@ + #define POPT_USE_TIOCGWINSZ + #ifdef POPT_USE_TIOCGWINSZ + #include +#ifdef __dietlibc__ +#include +#endif -+ - /*@access poptContext@*/ + #endif - /** + #define POPT_WCHAR_HACK diff --git a/popt-pl.po-update.patch b/popt-pl.po-update.patch new file mode 100644 index 0000000..e9a662e --- /dev/null +++ b/popt-pl.po-update.patch @@ -0,0 +1,20 @@ +--- popt-1.18/po/pl.po.orig 2020-06-23 13:15:12.000000000 +0200 ++++ popt-1.18/po/pl.po 2021-03-10 19:30:23.650808370 +0100 +@@ -62,7 +62,7 @@ + + #: src/popt.c:1643 + msgid "config file failed sanity test" +-msgstr "" ++msgstr "plik konfiguracyjny zawiera błędy" + + #: src/popt.c:1647 + msgid "unknown error" +@@ -106,7 +106,7 @@ + + #: src/popthelp.c:186 + msgid "SHORT" +-msgstr "" ++msgstr "SHORT" + + #: src/popthelp.c:187 + msgid "LONG" diff --git a/popt.spec b/popt.spec index 7c8fa9b..47a3a79 100644 --- a/popt.spec +++ b/popt.spec @@ -1,6 +1,6 @@ # # Conditional build: -%bcond_with dietlibc # don't build static dietlibc library +%bcond_with dietlibc # static dietlibc library Summary: C library for parsing command line parameters Summary(de.UTF-8): C-Library zum Parsen von Befehlszeilenparametern @@ -10,15 +10,15 @@ Summary(ru.UTF-8): Библиотека C для разбора параметр Summary(tr.UTF-8): Komut satırı parametrelerini ayrıştırımak için C arşivi Summary(uk.UTF-8): Бібліотека C для розбору параметрів командної стрічки Name: popt -Version: 1.17 -Release: 3 +Version: 1.18 +Release: 1 License: X Consortium (MIT-like) Group: Libraries -Source0: http://rpm5.org/files/popt/%{name}-%{version}.tar.gz -# Source0-md5: 7f98c657d35981d30dd372da5335c354 +Source0: http://ftp.rpm.org/popt/releases/popt-1.x/%{name}-%{version}.tar.gz +# Source0-md5: 450f2f636e6a3aa527de803d0ae76c5a Patch0: %{name}-diet.patch -Patch1: %{name}-alias-argc.patch -URL: http://rpm5.org/ +Patch1: %{name}-pl.po-update.patch +URL: https://rpm.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 %{?with_dietlibc:BuildRequires: dietlibc-static >= 2:0.31-5} @@ -26,9 +26,6 @@ BuildRequires: gettext-tools >= 0.11.5 BuildRequires: libtool >= 2:2.2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# don't require very fresh rpm.macros to build -%define __gettextize gettextize --copy --force ; cp -f po/Makevars{.template,} - # for some reason known only to rpm there must be "\\|" not "\|" here %define dietarch %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/') %define dietlibdir %{_prefix}/lib/dietlibc/lib-%{dietarch} @@ -165,8 +162,8 @@ Biblioteka statyczna dietlibc popt. %{__gettextize} %{__libtoolize} %{__aclocal} -I m4 -%{__autoheader} %{__autoconf} +%{__autoheader} %{__automake} -i %if %{with dietlibc} @@ -184,7 +181,7 @@ __cc="%{__cc}" # libpopt.la dependency on configmake.h missing %{__make} configmake.h %{__make} libpopt.la -mv -f .libs/libpopt.a diet-libpopt.a +%{__mv} .libs/libpopt.a diet-libpopt.a %{__make} clean %endif @@ -202,7 +199,7 @@ install -d $RPM_BUILD_ROOT/%{_lib} pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT -mv -f $RPM_BUILD_ROOT%{_libdir}/libpopt.so.* $RPM_BUILD_ROOT/%{_lib} +%{__mv} $RPM_BUILD_ROOT%{_libdir}/libpopt.so.* $RPM_BUILD_ROOT/%{_lib} ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libpopt.so.*.*.*) \ $RPM_BUILD_ROOT%{_libdir}/libpopt.so -- 2.44.0