- added build.patch

- ac/am regeneration

Changed files:
    build.patch -> 1.1
    dirmngr.spec -> 1.34

diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..c89f62f
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,11 @@
+--- 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.spec b/dirmngr.spec
index c5fe0be77134c3112b4c5d063b33cc7b17021b73..22b275f539de932afa97063fa36bb850c5a6d56f 100644 (file)
--- a/dirmngr.spec
+++ b/dirmngr.spec
@@ -8,6 +8,7 @@ Group:          Applications
 Source0:       ftp://ftp.gnupg.org/gcrypt/dirmngr/%{name}-%{version}.tar.bz2
 # Source0-md5: f2570f0248f5947daac200e85291b328
 Patch0:                %{name}-info.patch
+Patch1:                build.patch
 URL:           http://www.gnupg.org/documentation/manuals/dirmngr/
 BuildRequires: automake
 BuildRequires: libassuan-devel >= 1:2.0.0
@@ -38,9 +39,13 @@ wywoływany przez gpgsm i nie używany bezpośrednio.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
+%{__aclocal} -I m4
+%{__automake}
+%{__autoconf}
 %configure \
        --with-ldap=/usr
 %{__make}