[libksba/f18] fix multilib conflict in libksba-config

[Tomáš Mráz]

commit 295e2939d8865f99cb7a543fa0eb4f9f5317a667
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Dec 3 16:26:57 2012 +0100

    fix multilib conflict in libksba-config

 libksba-1.0.8-multilib.patch |   14 --------------
 libksba-1.3.0-multilib.patch |   23 +++++++++++++++++++++++
 libksba.spec                 |    7 +++++--
 3 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/libksba-1.3.0-multilib.patch b/libksba-1.3.0-multilib.patch
new file mode 100644
index 0000000..89f4096
--- /dev/null
+++ b/libksba-1.3.0-multilib.patch
@@ -0,0 +1,23 @@
+diff -up libksba-1.3.0/src/ksba-config.in.multilib libksba-1.3.0/src/ksba-config.in
+--- libksba-1.3.0/src/ksba-config.in.multilib	2011-02-25 09:33:11.000000000 +0100
++++ libksba-1.3.0/src/ksba-config.in	2012-12-03 16:17:52.050832689 +0100
+@@ -15,7 +15,7 @@ cflags="@KSBA_CONFIG_CFLAGS@ @GPG_ERROR_
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ api_version="@KSBA_CONFIG_API_VERSION@"
+-my_host="@KSBA_CONFIG_HOST@"
++my_host="none"
+ 
+ includes=""
+ libdirs=""
+@@ -125,10 +125,6 @@ if test "$echo_cflags" = "yes"; then
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    libdirs=""
+-    if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L at libdir@"
+-    fi
+     tmp=""
+     for i in $libdirs $libs; do
+        if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
diff --git a/libksba.spec b/libksba.spec
index dc25d2d..4c79e19 100644
--- a/libksba.spec
+++ b/libksba.spec
@@ -1,7 +1,7 @@
 Summary: CMS and X.509 library
 Name:    libksba
 Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # The library is licensed under LGPLv3+ or GPLv2+,
 # the rest of the package under GPLv3+
@@ -12,7 +12,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libksba-1.0.8-multilib.patch
+Patch1: libksba-1.3.0-multilib.patch
 
 BuildRequires: gawk
 BuildRequires: libgpg-error-devel >= 1.8
@@ -92,6 +92,9 @@ fi
 
 
 %changelog
+* Mon Dec  3 2012 Tomas Mraz <tmraz at redhat.com> - 1.3.0-2
+- fix multilib conflict in libksba-config
+
 * Wed Nov 21 2012 Tomas Mraz <tmraz at redhat.com> - 1.3.0-1
 - new upstream version