rpms/libassuan/devel libassuan-1.0.5-multilib.patch, NONE, 1.1 libassuan.spec, 1.32, 1.33 libassuan-1.0.4-multilib.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	libassuan.spec 
Added Files:
	libassuan-1.0.5-multilib.patch 
Removed Files:
	libassuan-1.0.4-multilib.patch 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-4
- better versioning for Obsoletes
- better (upstreamable) multilib patch


libassuan-1.0.5-multilib.patch:
 libassuan-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libassuan-1.0.5-multilib.patch ---
diff -up libassuan-1.0.5/src/libassuan-config.in.multilib libassuan-1.0.5/src/libassuan-config.in
--- libassuan-1.0.5/src/libassuan-config.in.multilib	2006-10-09 05:41:47.000000000 -0500
+++ libassuan-1.0.5/src/libassuan-config.in	2009-12-17 07:11:30.688919319 -0600
@@ -132,7 +132,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-    if test "@libdir@" != "/usr/lib" ; then
+    if test "@libdir@" != "/usr/lib" -a "@libdir@" != "/usr/lib32" -a "@libdir@" != "/usr/lib64" ; then
       libdirs="-L at libdir@"
       for i in $lib $extralibs ; do
 	if test "$i" = "-L at libdir@" ; then


Index: libassuan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libassuan.spec	17 Dec 2009 12:45:51 -0000	1.32
+++ libassuan.spec	17 Dec 2009 13:15:24 -0000	1.33
@@ -2,7 +2,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # The library is LGPLv2+, the documentation GPLv3+
 License: LGPLv2+ and GPLv3+
@@ -12,7 +12,7 @@ URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:  libassuan-1.0.4-multilib.patch
+Patch1:  libassuan-1.0.5-multilib.patch
 
 # -debuginfo useless for (only) static libs
 %define debug_package   %{nil}
@@ -30,8 +30,8 @@ Group: Development/Libraries
 Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Obsoletes: %{name}-static < %{version}-%{release}
-Provides:  %{name}-static = %{version}-%{release}
+Obsoletes: libassuan-static < 1.0.3 
+Provides:  libassuan-static = %{version}-%{release}
 %description devel 
 This is the IPC static library used by GnuPG 2, GPGME and a few other
 packages.
@@ -91,6 +91,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-4
+- better versioning for Obsoletes
+- better (upstreamable) multilib patch
+
 * Thu Dec 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.5-3
 - Fix license tag - the documentation is GPLv3+
 


--- libassuan-1.0.4-multilib.patch DELETED ---