diff --git a/libassuan-1.0.4-multilib.patch b/libassuan-1.0.4-multilib.patch new file mode 100644 index 0000000..ade7436 --- /dev/null +++ b/libassuan-1.0.4-multilib.patch @@ -0,0 +1,17 @@ +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.spec b/libassuan.spec index e5b4f6d..76430e9 100644 --- a/libassuan.spec +++ b/libassuan.spec @@ -2,7 +2,7 @@ Name: libassuan Summary: GnuPG IPC library Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2 @@ -11,6 +11,8 @@ 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 + # -debuginfo useless for (only) static libs %define debug_package %{nil} @@ -39,6 +41,8 @@ This package contains files needed to develop applications using %{name}. %prep %setup -q +%patch1 -p1 -b .multilib + %build #ifarch x86_64 @@ -86,6 +90,9 @@ rm -rf %{buildroot} %changelog +* Thu Apr 03 2008 Rex Dieter 1.0.4-3 +- multiarch conflicts (#341911) + * Fri Feb 08 2008 Rex Dieter 1.0.4-2 - respin (gcc43)