[packages/popt] - added am patch (workaround for recent automake versions) - release 2

qboosh qboosh at pld-linux.org
Sun Jul 14 11:15:08 CEST 2013


commit 4f14b7260e6a26d6f5e50a3bc1ed56f06bf336a8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 14 11:15:02 2013 +0200

    - added am patch (workaround for recent automake versions)
    - release 2

 popt-am.patch | 11 +++++++++++
 popt.spec     |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/popt.spec b/popt.spec
index 89a06a0..53eb486 100644
--- a/popt.spec
+++ b/popt.spec
@@ -11,13 +11,14 @@ Summary(tr.UTF-8):	Komut satırı parametrelerini ayrıştırımak için C arşi
 Summary(uk.UTF-8):	Бібліотека C для розбору параметрів командної стрічки
 Name:		popt
 Version:	1.16
-Release:	1
+Release:	2
 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
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -158,6 +159,7 @@ Biblioteka statyczna dietlibc popt.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i -e 's#po/Makefile.in intl/Makefile##g' configure.ac
 
diff --git a/popt-am.patch b/popt-am.patch
new file mode 100644
index 0000000..df4d8ca
--- /dev/null
+++ b/popt-am.patch
@@ -0,0 +1,11 @@
+--- 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
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/popt.git/commitdiff/4f14b7260e6a26d6f5e50a3bc1ed56f06bf336a8



More information about the pld-cvs-commit mailing list