diff --git a/libassuan-1.0.4-multilib.patch b/libassuan-1.0.4-multilib.patch deleted file mode 100644 index ade7436..0000000 --- a/libassuan-1.0.4-multilib.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up libassuan-1.0.4/src/libassuan-config.in.multilib libassuan-1.0.4/src/libassuan-config.in ---- libassuan-1.0.4/src/libassuan-config.in.multilib 2006-10-09 05:41:47.000000000 -0500 -+++ libassuan-1.0.4/src/libassuan-config.in 2008-04-03 11:29:37.000000000 -0500 -@@ -132,13 +132,5 @@ if test "$echo_cflags" = "yes"; then - fi - - if test "$echo_libs" = "yes"; then -- if test "@libdir@" != "/usr/lib" ; then -- libdirs="-L@libdir@" -- for i in $lib $extralibs ; do -- if test "$i" = "-L@libdir@" ; then -- libdirs="" -- fi -- done -- fi - echo $libdirs $lib${thread_module} $extralibs - fi diff --git a/libassuan-1.0.5-multilib.patch b/libassuan-1.0.5-multilib.patch new file mode 100644 index 0000000..45f9a03 --- /dev/null +++ b/libassuan-1.0.5-multilib.patch @@ -0,0 +1,12 @@ +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@libdir@" + for i in $lib $extralibs ; do + if test "$i" = "-L@libdir@" ; then diff --git a/libassuan.spec b/libassuan.spec index 6b12721..28c7224 100644 --- a/libassuan.spec +++ b/libassuan.spec @@ -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 - 1.0.5-4 +- better versioning for Obsoletes +- better (upstreamable) multilib patch + * Thu Dec 17 2009 Tomas Mraz - 1.0.5-3 - Fix license tag - the documentation is GPLv3+