[libassuan] multilib conflict in libassuan-config fixed

[Tomáš Mráz]

commit cd221906eb95a5dcecdde28b5ac891cb249a6b5d
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Dec 3 13:17:44 2012 +0100

    multilib conflict in libassuan-config fixed

 libassuan-1.0.5-multilib.patch |   12 ------------
 libassuan-2.0.3-multilib.patch |   19 +++++++++++++++++++
 libassuan.spec                 |    5 ++++-
 3 files changed, 23 insertions(+), 13 deletions(-)
---
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 at libdir@"
+-      for i in $lib $extralibs ; do
+-	if test "$i" = "-L at 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 at redhat.com> 2.0.3-2
+- multilib conflict in libassuan-config fixed
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild