[packages/popt] up to 1.17

[glen]

commit 3ccc6ec7d44ea16b91cc20feed39a0ab0e5e2020
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Oct 7 09:16:33 2014 +0300

    up to 1.17
    
    use "staged tarball" from src.rpm
    http://yum.jbj.org/pub/centos-6/SRPMS.i386/popt-1.17-1.src.rpm
    
    http://rpm5.org/community/popt-devel/0288.html

 popt-am.patch            | 11 -----------
 popt-automake_1_12.patch | 11 -----------
 popt.spec                | 25 +++++++++++++------------
 3 files changed, 13 insertions(+), 34 deletions(-)
---
diff --git a/popt.spec b/popt.spec
index 53eb486..6d0e4fb 100644
--- a/popt.spec
+++ b/popt.spec
@@ -10,15 +10,13 @@ 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.16
-Release:	2
+Version:	1.17
+Release:	1
 License:	X Consortium (MIT-like)
 Group:		Libraries
 Source0:	http://rpm5.org/files/popt/%{name}-%{version}.tar.gz
-# Source0-md5:	3743beefa3dd6247a73f8f7a32c14c33
-Patch0:		%{name}-automake_1_12.patch
-Patch1:		%{name}-diet.patch
-Patch2:		%{name}-am.patch
+# Source0-md5:	7f98c657d35981d30dd372da5335c354
+Patch0:		%{name}-diet.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -35,10 +33,10 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		dietlibdir	%{_prefix}/lib/dietlibc/lib-%{dietarch}
 
 %description
-Popt is a C library for passing command line parameters. It was heavily
-influenced by the getopt() and getopt_long() functions, but it allows
-more powerful argument expansion. It can parse arbitrary argv[] style
-arrays and automatically set variables based on command line
+Popt is a C library for passing command line parameters. It was
+heavily influenced by the getopt() and getopt_long() functions, but it
+allows more powerful argument expansion. It can parse arbitrary argv[]
+style arrays and automatically set variables based on command line
 arguments. It also allows command line arguments to be aliased via
 configuration files and includes utility functions for parsing
 arbitrary strings into argv[] arrays using shell-like rules.
@@ -158,8 +156,6 @@ Biblioteka statyczna dietlibc popt.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's#po/Makefile.in intl/Makefile##g' configure.ac
 
@@ -176,9 +172,14 @@ __cc="%{__cc}"
 %configure \
 	CC="diet ${__cc#ccache } %{rpmcflags} %{rpmldflags} -Os -static" \
 	ac_cv_func_stpcpy=yes \
+%if "%{?configure_cache}" == "1"
+	--cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}-initrd.cache \
+%endif
 	--enable-static \
 	--disable-shared
 
+# libpopt.la dependency on configmake.h missing
+%{__make} configmake.h
 %{__make} libpopt.la
 mv -f .libs/libpopt.a diet-libpopt.a
 %{__make} clean
diff --git a/popt-am.patch b/popt-am.patch
deleted file mode 100644
index df4d8ca..0000000
--- a/popt-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- popt-1.16/Makefile.am.orig	2010-05-04 22:55:54.000000000 +0200
-+++ popt-1.16/Makefile.am	2013-07-14 11:09:04.332434012 +0200
-@@ -37,7 +37,7 @@
- TESTS_ENVIRONMENT = \
- test1="$(top_builddir)/test1"
- 
--TESTS = $(top_srcdir)/testit.sh
-+TESTS = testit.sh
- 
- include_HEADERS = popt.h
- 
diff --git a/popt-automake_1_12.patch b/popt-automake_1_12.patch
deleted file mode 100644
index 345f179..0000000
--- a/popt-automake_1_12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -dur popt-1.16.orig/configure.ac popt-1.16/configure.ac
---- popt-1.16.orig/configure.ac	2012-06-18 21:12:58.000000000 +0200
-+++ popt-1.16/configure.ac	2012-06-18 21:14:01.185438214 +0200
-@@ -46,7 +46,6 @@
- AC_SYS_LARGEFILE
- 
- AC_ISC_POSIX
--AM_C_PROTOTYPES
- 
- AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/popt.git/commitdiff/3ccc6ec7d44ea16b91cc20feed39a0ab0e5e2020