From b6afadd83a40a1295e41107db5cbc2c1971ea1f3ca5cbd5751a6fd7970f68e82 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sun, 7 Jul 2013 17:39:14 +0000 Subject: [PATCH] Accepting request 182427 from home:jengelh:branches:Base:System - Fix typo in popt-libc-updates.patch that prevented it to work with glibc before 2.17. OBS-URL: https://build.opensuse.org/request/show/182427 OBS-URL: https://build.opensuse.org/package/show/Base:System/popt?expand=0&rev=42 --- popt-libc-updates.patch | 2 +- popt.changes | 7 +++++++ popt.spec | 7 +++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/popt-libc-updates.patch b/popt-libc-updates.patch index fe523d6..6260312 100644 --- a/popt-libc-updates.patch +++ b/popt-libc-updates.patch @@ -75,7 +75,7 @@ Index: system.h -#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__) -#define getenv(_s) __secure_getenv(_s) +#ifndef HAVE_SECURE_GETENV -+# ifdef HAVE__SECURE_GETENV ++# ifdef HAVE___SECURE_GETENV +# define secure_getenv __secure_getenv +# else +# error neither secure_getenv nor __secure_getenv is available diff --git a/popt.changes b/popt.changes index b3e68cf..676c243 100644 --- a/popt.changes +++ b/popt.changes @@ -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 diff --git a/popt.spec b/popt.spec index c574b08..bb8bdf7 100644 --- a/popt.spec +++ b/popt.spec @@ -24,6 +24,8 @@ Summary: A C library for parsing command line parameters License: MIT Group: System Environment/Libraries 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 Source2: baselibs.conf BuildRequires: libtool @@ -76,7 +78,7 @@ autoreconf -fiv make %{?_smp_mflags} %install -%make_install +make install DESTDIR="%buildroot" rm %{buildroot}%{_libdir}/libpopt.la %if "%{_libdir}" != "%{_prefix}/lib" @@ -86,9 +88,6 @@ mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgco %find_lang %{name} -%clean -rm -rf %{buildroot} - %post -n libpopt0 -p /sbin/ldconfig %postun -n libpopt0 -p /sbin/ldconfig