From f8ec4992da27f8318c1ad8babee99e2a578cfea9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 4 Jan 2008 16:48:27 +0000
Subject: [PATCH] - gpgme-1.1.6 - multiarch conflicts in gpgme (#341351)

---
 .cvsignore |  8 ++------
 gpgme.spec | 16 ++++++++++++----
 sources    |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 786d40d..10b8944 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,3 @@
 clog
-gpgme-1.1.3.tar.bz2
-gpgme-1.1.3.tar.bz2.sig
-gpgme-1.1.4.tar.bz2
-gpgme-1.1.4.tar.bz2.sig
-gpgme-1.1.5.tar.bz2
-gpgme-1.1.5.tar.bz2.sig
+gpgme-1.1.6.tar.bz2
+gpgme-1.1.6.tar.bz2.sig
diff --git a/gpgme.spec b/gpgme.spec
index 2e74b6d..7674663 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -1,8 +1,8 @@
 
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
-Version: 1.1.5
-Release: 4%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
 
 License: LGPLv2+
 Group:   Applications/System
@@ -49,6 +49,10 @@ Requires(postun): /sbin/install-info
 
 %patch1 -p1 -b .config_extras
 
+## HACK ALERT
+# The config script already suppresses the -L if it's /usr/lib, so cheat and
+# set it to a value which we know will be suppressed.
+sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' gpgme/gpgme-config.in
 
 %build
 %configure \
@@ -94,18 +98,22 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
-%{_libdir}/lib*.so.*
+%{_libdir}/libgpgme*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gpgme-config
 %{_includedir}/*
-%{_libdir}/lib*.so
+%{_libdir}/libgpgme*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme.info*
 
 
 %changelog
+* Fri Jan 04 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.6-1
+- gpgme-1.1.6
+- multiarch conflicts in gpgme (#341351)
+
 * Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.5-4
 - BR: gawk
 
diff --git a/sources b/sources
index 7086592..e1a48fd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-db7d7dfc10edcc20e8a15a7a8fdc1080  gpgme-1.1.5.tar.bz2
-9329f48a489f797a686d5322f9169c9d  gpgme-1.1.5.tar.bz2.sig
+daddf775ace2594da834f15c8ebb045e  gpgme-1.1.6.tar.bz2
+c387e5671dac9b04c74a4d1818980360  gpgme-1.1.6.tar.bz2.sig