[packages/abook] - rebuild ac/am explicitly instead of rebuilding and re-running configure at make stage - added am p

qboosh qboosh at pld-linux.org
Thu Mar 14 20:49:51 CET 2013


commit ccbfc57232ab6e2fc408d23daf3efc1c8a636907
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Mar 14 20:49:40 2013 +0100

    - rebuild ac/am explicitly instead of rebuilding and re-running configure at make stage
    - added am patch (fixes build with automake 1.13)

 abook-am.patch | 13 +++++++++++++
 abook.spec     | 13 ++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/abook.spec b/abook.spec
index 6eeb735..c3266db 100644
--- a/abook.spec
+++ b/abook.spec
@@ -12,10 +12,11 @@ Source0:	http://abook.sourceforge.net/devel/%{name}-%{version}%{subver}.tar.gz
 Patch0:		%{name}-tinfo_link.patch
 Patch1:		%{name}-vcard_import.patch
 Patch2:		%{name}-ea5caf0.patch
+Patch3:		%{name}-am.patch
 URL:		http://abook.sourceforge.net/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	gettext-devel >= 0.14.1
+BuildRequires:	gettext-devel >= 0.18.1
 BuildRequires:	ncurses-devel >= 5.0
 BuildRequires:	readline-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,11 +31,17 @@ do użycia z programem pocztowym mutt.
 
 %prep
 %setup -q -n %{name}-%{version}%{subver}
-%patch0
+%patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
+%{__gettextize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
diff --git a/abook-am.patch b/abook-am.patch
new file mode 100644
index 0000000..96f2168
--- /dev/null
+++ b/abook-am.patch
@@ -0,0 +1,13 @@
+--- abook-0.6.0pre2/configure.ac.orig	2013-03-14 19:05:29.494683245 +0100
++++ abook-0.6.0pre2/configure.ac	2013-03-14 19:11:30.378009058 +0100
+@@ -44,10 +44,6 @@
+ 
+ AC_PROG_CC
+ AC_SEARCH_LIBS([strerror],[cposix])
+-AM_C_PROTOTYPES
+-if test "x$U" != "x"; then
+-	AC_MSG_ERROR(Compiler not ANSI compliant)
+-fi
+ AC_C_INLINE
+ AC_PROG_INSTALL
+ AC_HEADER_STDC
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/abook.git/commitdiff/ccbfc57232ab6e2fc408d23daf3efc1c8a636907



More information about the pld-cvs-commit mailing list