From ebd764b829a8e0f028726d61672c462b97860259 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sun, 14 Feb 2010 21:04:06 +0000
Subject: [PATCH] - FTBFS gpgme-1.1.8-3.fc13: ImplicitDSOLinking (#564605)

---
 gpgme-1.1.8-ImplicitDSOLinking.patch | 26 ++++++++++++++++++++++++++
 gpgme.spec                           |  9 ++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 gpgme-1.1.8-ImplicitDSOLinking.patch

diff --git a/gpgme-1.1.8-ImplicitDSOLinking.patch b/gpgme-1.1.8-ImplicitDSOLinking.patch
new file mode 100644
index 0000000..0cb6a81
--- /dev/null
+++ b/gpgme-1.1.8-ImplicitDSOLinking.patch
@@ -0,0 +1,26 @@
+diff -up gpgme-1.1.8/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.1.8/tests/gpgsm/Makefile.am
+--- gpgme-1.1.8/tests/gpgsm/Makefile.am.ImplicitDSOLinking	2008-12-03 07:39:48.000000000 -0600
++++ gpgme-1.1.8/tests/gpgsm/Makefile.am	2010-02-14 14:59:43.567369732 -0600
+@@ -32,7 +32,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
+ INCLUDES = -I$(top_builddir)/src
+ 
+ AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+-LDADD = ../../src/libgpgme.la
++LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
+ 
+ # We don't run t-genkey in the test suite, because it takes too long
+ # and needs a working pinentry.
+diff -up gpgme-1.1.8/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.1.8/tests/gpgsm/Makefile.in
+--- gpgme-1.1.8/tests/gpgsm/Makefile.in.ImplicitDSOLinking	2008-12-08 12:41:52.000000000 -0600
++++ gpgme-1.1.8/tests/gpgsm/Makefile.in	2010-02-14 15:01:18.270368592 -0600
+@@ -283,7 +283,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
+ 
+ INCLUDES = -I$(top_builddir)/src
+ AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+-LDADD = ../../src/libgpgme.la
++LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
+ key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
+ DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
+ 	private-keys-v1.d/$(key_id).key random_seed
+diff -up gpgme-1.1.8/tests/Makefile.am.ImplicitDSOLinking gpgme-1.1.8/tests/Makefile.am
+diff -up gpgme-1.1.8/tests/Makefile.in.ImplicitDSOLinking gpgme-1.1.8/tests/Makefile.in
diff --git a/gpgme.spec b/gpgme.spec
index ac7fda8..bf86204 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.1.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+
 Group:   Applications/System
@@ -13,6 +13,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: gpgme-1.1.8-config_extras.patch
 
+# fix ImplicitDSOLinking in tests/, upstreamable
+Patch2:  gpgme-1.1.8-ImplicitDSOLinking.patch
+
 BuildRequires: gawk
 BuildRequires: gnupg2
 BuildRequires: gnupg2-smime
@@ -47,6 +50,7 @@ Requires(postun): /sbin/install-info
 %setup -q
 
 %patch1 -p1 -b .config_extras
+%patch2 -p1 -b .ImplicitDSOLinking
 
 ## HACK ALERT
 # The config script already suppresses the -L if it's /usr/lib, so cheat and
@@ -112,6 +116,9 @@ fi
 
 
 %changelog
+* Sun Feb 14 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.8-4
+- FTBFS gpgme-1.1.8-3.fc13: ImplicitDSOLinking (#564605)
+
 * Thu Nov 19 2009 Tomas Mraz <tmraz@redhat.com> - 1.1.8-3
 - Add buildrequires gnupg2-smime for the gpgsm