From cd221906eb95a5dcecdde28b5ac891cb249a6b5d Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Dec 03 2012 12:17:44 +0000
Subject: multilib conflict in libassuan-config fixed


---

diff --git a/libassuan-1.0.5-multilib.patch b/libassuan-1.0.5-multilib.patch
deleted file mode 100644
index 45f9a03..0000000
--- a/libassuan-1.0.5-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libassuan-1.0.5/src/libassuan-config.in.multilib libassuan-1.0.5/src/libassuan-config.in
---- libassuan-1.0.5/src/libassuan-config.in.multilib	2006-10-09 05:41:47.000000000 -0500
-+++ libassuan-1.0.5/src/libassuan-config.in	2009-12-17 07:11:30.688919319 -0600
-@@ -132,7 +132,7 @@ if test "$echo_cflags" = "yes"; then
- fi
- 
- if test "$echo_libs" = "yes"; then
--    if test "@libdir@" != "/usr/lib" ; then
-+    if test "@libdir@" != "/usr/lib" -a "@libdir@" != "/usr/lib32" -a "@libdir@" != "/usr/lib64" ; then
-       libdirs="-L@libdir@"
-       for i in $lib $extralibs ; do
- 	if test "$i" = "-L@libdir@" ; then
diff --git a/libassuan-2.0.3-multilib.patch b/libassuan-2.0.3-multilib.patch
new file mode 100644
index 0000000..1735e65
--- /dev/null
+++ b/libassuan-2.0.3-multilib.patch
@@ -0,0 +1,19 @@
+diff -up libassuan-2.0.3/src/libassuan-config.in.multilib libassuan-2.0.3/src/libassuan-config.in
+--- libassuan-2.0.3/src/libassuan-config.in.multilib	2011-04-06 17:40:47.000000000 +0200
++++ libassuan-2.0.3/src/libassuan-config.in	2012-12-03 12:14:17.397866418 +0100
+@@ -121,13 +121,7 @@ if test "$echo_cflags" = "yes"; then
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@libdir@"
+-      for i in $lib $extralibs ; do
+-	if test "$i" = "-L@libdir@" ; then
+-	  libdirs=""
+-	fi
+-      done
+-    fi
++    # libdir is always standard and implicitly searched
++    libdirs=""
+     echo $libdirs $lib $extralibs
+ fi
diff --git a/libassuan.spec b/libassuan.spec
index 7e62f11..e9d3a96 100644
--- a/libassuan.spec
+++ b/libassuan.spec
@@ -11,7 +11,7 @@ URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:  libassuan-1.0.5-multilib.patch
+Patch1:  libassuan-2.0.3-multilib.patch
 
 BuildRequires: gawk
 BuildRequires: libgpg-error-devel >= 1.8
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec  3 2012 Tomáš Mráz <tmraz@redhat.com> 2.0.3-2
+- multilib conflict in libassuan-config fixed
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild