- rebuild ac/am explicitly instead of rebuilding and re-running configure at make...

- added am patch (fixes build with automake 1.13)

diff --git a/abook-am.patch b/abook-am.patch
new file mode 100644 (file)
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

diff --git a/abook.spec b/abook.spec
index 6eeb735c3e704b3f3e9436963f7f07786dd46bf3..c3266db51ed16e5897f65f5f61917e51735da146 100644 (file)
--- 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}