From cc33fea970b4002759b179e4f0f725b6c50aa450 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jun 02 2011 13:27:58 +0000
Subject: libksba-devel multilib conflict (#601976)


---

diff --git a/libksba-1.0.6-multilib.patch b/libksba-1.0.6-multilib.patch
deleted file mode 100644
index c10606c..0000000
--- a/libksba-1.0.6-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libksba-1.0.6/src/ksba-config.in.multilib libksba-1.0.6/src/ksba-config.in
---- libksba-1.0.6/src/ksba-config.in.multilib	2006-08-31 03:05:24.000000000 -0500
-+++ libksba-1.0.6/src/ksba-config.in	2009-12-17 07:17:28.312946199 -0600
-@@ -116,7 +116,7 @@ fi
- 
- if test "$echo_libs" = "yes"; then
-     libdirs=""
--    if test "@libdir@" != "/usr/lib" ; then
-+    if test "@libdir@" != "/usr/lib" -a "@libdir@" != "/usr/lib32" -a "@libdir@" != "/usr/lib64" ; then
-       libdirs="-L@libdir@"
-     fi
-     tmp=""
diff --git a/libksba-1.0.8-multilib.patch b/libksba-1.0.8-multilib.patch
new file mode 100644
index 0000000..7d71944
--- /dev/null
+++ b/libksba-1.0.8-multilib.patch
@@ -0,0 +1,14 @@
+diff -up libksba-1.0.8/src/ksba-config.in.multilib libksba-1.0.8/src/ksba-config.in
+--- libksba-1.0.8/src/ksba-config.in.multilib	2006-08-31 03:05:24.000000000 -0500
++++ libksba-1.0.8/src/ksba-config.in	2011-06-02 08:26:26.846514445 -0500
+@@ -115,10 +115,6 @@ if test "$echo_cflags" = "yes"; then
+ 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 dd85805..98dd041 100644
--- a/libksba.spec
+++ b/libksba.spec
@@ -1,7 +1,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Group:   System Environment/Libraries
@@ -10,7 +10,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.6-multilib.patch
+Patch1: libksba-1.0.8-multilib.patch
 
 BuildRequires: gawk
 BuildRequires: libgpg-error-devel >= 1.8
@@ -89,6 +89,9 @@ fi
 
 
 %changelog
+* Thu Jun 02 2011 Rex Dieter <rdieter@fedoraproject.org> 1.0.8-3
+- libksba-devel multilib conflict (#601976)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild