rpms/libksba/devel libksba-1.0.6-multilib.patch, NONE, 1.1 libksba.spec, 1.36, 1.37 libksba-1.0.3-multilib.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libksba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29989

Modified Files:
	libksba.spec 
Added Files:
	libksba-1.0.6-multilib.patch 
Removed Files:
	libksba-1.0.3-multilib.patch 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.6-4
- better (upstreamable) multilib patch
- tighten %files a bit


libksba-1.0.6-multilib.patch:
 ksba-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libksba-1.0.6-multilib.patch ---
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 at libdir@"
     fi
     tmp=""


Index: libksba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libksba.spec	10 Aug 2009 09:17:28 -0000	1.36
+++ libksba.spec	17 Dec 2009 13:36:14 -0000	1.37
@@ -2,7 +2,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3
 Group:   System Environment/Libraries
@@ -11,8 +11,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libk
 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
+Patch1: libksba-1.0.6-multilib.patch
 
 BuildRequires: gawk
 # >= 1.4 preferred
@@ -86,12 +85,16 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/ksba-config
 %{_libdir}/libksba.so
-%{_includedir}/*
-%{_datadir}/aclocal/*
-%{_infodir}/*
+%{_includedir}/ksba.h
+%{_datadir}/aclocal/ksba.m4
+%{_infodir}/ksba.info*
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.6-4
+- better (upstreamable) multilib patch
+- tighten %%files a bit
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-3
 - Convert specfile to UTF-8.
 


--- libksba-1.0.3-multilib.patch DELETED ---