From 021e956e8d6e1b29fe91e96e181f59af3f48e44a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Thu, 3 Apr 2008 15:24:11 +0000
Subject: [PATCH] - multiarch conflicts (#342201)

---
 libksba-1.0.3-multilib.patch | 13 +++++++++++++
 libksba.spec                 | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 libksba-1.0.3-multilib.patch

diff --git a/libksba-1.0.3-multilib.patch b/libksba-1.0.3-multilib.patch
new file mode 100644
index 0000000..525fb90
--- /dev/null
+++ b/libksba-1.0.3-multilib.patch
@@ -0,0 +1,13 @@
+diff -up libksba-1.0.3/src/ksba-config.in.multilib libksba-1.0.3/src/ksba-config.in
+--- libksba-1.0.3/src/ksba-config.in.multilib	2006-08-31 03:05:24.000000000 -0500
++++ libksba-1.0.3/src/ksba-config.in	2008-04-03 11:21:11.000000000 -0500
+@@ -116,9 +116,6 @@ fi
+ 
+ if test "$echo_libs" = "yes"; then
+     libdirs=""
+-    if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@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 53a60a1..fd666f8 100644
--- a/libksba.spec
+++ b/libksba.spec
@@ -2,7 +2,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3
 Group:   System Environment/Libraries
@@ -11,6 +11,9 @@ 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)
 
+# quick-n-dirty hack to ksba-config, TODO: consider using pkgconfig instead
+Patch1: libksba-1.0.3-multilib.patch
+
 BuildRequires: gawk
 BuildRequires: libgpg-error-devel >= 1.2 
 BuildRequires: libgcrypt-devel >= 1.2.0
@@ -32,6 +35,8 @@ Requires(preun): /sbin/install-info
 %prep
 %setup -q
 
+%patch1 -p1 -b .multilib
+
 
 %build
 %configure \
@@ -86,6 +91,9 @@ fi
 
 
 %changelog
+* Thu Apr 03 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.3-2
+- multiarch conflicts (#342201)
+
 * Tue Feb 12 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.3-1
 - libksba-1.0.3