rpms/libksba/devel libksba-1.0.3-multilib.patch, NONE, 1.1 libksba.spec, 1.29, 1.30

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/libksba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9339

Modified Files:
	libksba.spec 
Added Files:
	libksba-1.0.3-multilib.patch 
Log Message:
* Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.3-2
- multiarch conflicts (#342201)


libksba-1.0.3-multilib.patch:

--- NEW FILE libksba-1.0.3-multilib.patch ---
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 at libdir@"
-    fi
     tmp=""
     for i in $libdirs $libs; do
        if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then


Index: libksba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libksba.spec	12 Feb 2008 21:39:06 -0000	1.29
+++ libksba.spec	3 Apr 2008 15:24:11 -0000	1.30
@@ -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 @@
 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 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .multilib
+
 
 %build
 %configure \
@@ -86,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.3-2
+- multiarch conflicts (#342201)
+
 * Tue Feb 12 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.3-1
 - libksba-1.0.3