[packages/dirmngr] - updated to 1.1.1 - removed obsolete build patch - added am patch (fixes build with automake 1.13+)

[qboosh]

commit 3af367db52b93a6c82d27eb6699c5d20556a9cd5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 7 21:23:25 2013 +0200

    - updated to 1.1.1
    - removed obsolete build patch
    - added am patch (fixes build with automake 1.13+)

 build.patch      | 11 -----------
 dirmngr-am.patch | 11 +++++++++++
 dirmngr.spec     | 13 +++++++------
 3 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/dirmngr.spec b/dirmngr.spec
index 22b275f..5ca25dc 100644
--- a/dirmngr.spec
+++ b/dirmngr.spec
@@ -1,16 +1,17 @@
 Summary:	X509/LDAP certificate and revocation list client
 Summary(pl.UTF-8):	Klient certyfikatów i list anulujących X509/LDAP
 Name:		dirmngr
-Version:	1.1.0
+Version:	1.1.1
 Release:	1
 License:	GPL v2+
 Group:		Applications
 Source0:	ftp://ftp.gnupg.org/gcrypt/dirmngr/%{name}-%{version}.tar.bz2
-# Source0-md5:	f2570f0248f5947daac200e85291b328
+# Source0-md5:	f5a40e93bcf07a94522579bfd58a2c96
 Patch0:		%{name}-info.patch
-Patch1:		build.patch
+Patch1:		%{name}-am.patch
 URL:		http://www.gnupg.org/documentation/manuals/dirmngr/
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.9.3
 BuildRequires:	libassuan-devel >= 1:2.0.0
 BuildRequires:	libgcrypt-devel >= 1.4.0
 BuildRequires:	libgpg-error-devel >= 1.4
@@ -42,10 +43,10 @@ wywoływany przez gpgsm i nie używany bezpośrednio.
 %patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.* .
 %{__aclocal} -I m4
-%{__automake}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--with-ldap=/usr
 %{__make}
diff --git a/build.patch b/build.patch
deleted file mode 100644
index c89f62f..0000000
--- a/build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dirmngr-1.1.0/src/Makefile.am.orig	2011-09-26 17:20:24.195406410 +0200
-+++ dirmngr-1.1.0/src/Makefile.am	2011-09-26 17:22:43.666427455 +0200
-@@ -61,7 +61,7 @@ dirmngr_ldap_SOURCES = dirmngr_ldap.c i1
- dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS)
- dirmngr_ldap_LDFLAGS =
- dirmngr_ldap_LDADD = $(ldap_ldadd) ../jnlib/libjnlib.a $(LIBOBJS) \
--		     $(GPG_ERROR_LIBS) $(LDAPLIBS) $(LIBINTL) $(LIBICONV)
-+		     $(GPG_ERROR_LIBS) $(LDAPLIBS) -llber $(LIBINTL) $(LIBICONV)
- 
- dirmngr_client_SOURCES = dirmngr-client.c i18n.h util.h b64enc.c \
-                          get-path.c no-libgcrypt.c no-libgcrypt.h 
diff --git a/dirmngr-am.patch b/dirmngr-am.patch
new file mode 100644
index 0000000..f61b217
--- /dev/null
+++ b/dirmngr-am.patch
@@ -0,0 +1,11 @@
+--- dirmngr-1.1.1/configure.ac.orig	2013-04-26 10:15:54.000000000 +0200
++++ dirmngr-1.1.1/configure.ac	2013-05-07 21:16:11.345896254 +0200
+@@ -54,7 +54,7 @@
+ 
+ 
+ AC_CONFIG_SRCDIR(src/dirmngr.c)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+ AB_INIT
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dirmngr.git/commitdiff/3af367db52b93a6c82d27eb6699c5d20556a9cd5