pool/popt
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 182428 from Base:System

Browse Source 
- Fix typo in popt-libc-updates.patch that prevented it to work
  with glibc before 2.17. (forwarded request 182427 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/182428
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/popt?expand=0&rev=29
This commit is contained in:
Stephan Kulow 2013-07-11 11:31:25 +00:00 committed by Git OBS Bridge
commit 1a7c296c45
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popt-libc-updates.patch
View File

@ -75,7 +75,7 @@ Index: system.h
-#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__) -#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__)
-#define getenv(_s) __secure_getenv(_s) -#define getenv(_s) __secure_getenv(_s)
+#ifndef HAVE_SECURE_GETENV +#ifndef HAVE_SECURE_GETENV
+# ifdef HAVE__SECURE_GETENV +# ifdef HAVE___SECURE_GETENV
+# define secure_getenv __secure_getenv +# define secure_getenv __secure_getenv
+# else +# else
+# error neither secure_getenv nor __secure_getenv is available +# error neither secure_getenv nor __secure_getenv is available

7
popt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jul 7 16:34:40 UTC 2013 - jengelh@inai.de
- Fix typo in popt-libc-updates.patch that prevented it to work
with glibc before 2.17.
- More robust make install call; remove redundant %clean section
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 14 15:15:49 UTC 2013 - coolo@suse.com Fri Jun 14 15:15:49 UTC 2013 - coolo@suse.com

7
popt.spec
View File

@ -24,6 +24,8 @@ Summary: A C library for parsing command line parameters
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
Url: http://www.rpm5.org/ Url: http://www.rpm5.org/
#CVS-Clone: -d :pserver:anonymous@rpm5.org:/cvs co popt
Source: http://rpm5.org/files/popt/popt-%{version}.tar.gz Source: http://rpm5.org/files/popt/popt-%{version}.tar.gz
Source2: baselibs.conf Source2: baselibs.conf
BuildRequires: libtool BuildRequires: libtool
@ -76,7 +78,7 @@ autoreconf -fiv
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install make install DESTDIR="%buildroot"
rm %{buildroot}%{_libdir}/libpopt.la rm %{buildroot}%{_libdir}/libpopt.la
%if "%{_libdir}" != "%{_prefix}/lib" %if "%{_libdir}" != "%{_prefix}/lib"
@ -86,9 +88,6 @@ mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgco
%find_lang %{name} %find_lang %{name}
%clean
rm -rf %{buildroot}
%post -n libpopt0 -p /sbin/ldconfig %post -n libpopt0 -p /sbin/ldconfig
%postun -n libpopt0 -p /sbin/ldconfig %postun -n libpopt0 -p /sbin/ldconfig