- multiarch conflicts (#341911)
This commit is contained in:
parent
a2b22c1da6
commit
6536f0775c
17
libassuan-1.0.4-multilib.patch
Normal file
17
libassuan-1.0.4-multilib.patch
Normal file
@ -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
|
@ -2,7 +2,7 @@
|
|||||||
Name: libassuan
|
Name: libassuan
|
||||||
Summary: GnuPG IPC library
|
Summary: GnuPG IPC library
|
||||||
Version: 1.0.4
|
Version: 1.0.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
|
Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
|
||||||
@ -11,6 +11,8 @@ URL: http://www.gnupg.org/
|
|||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
Patch1: libassuan-1.0.4-multilib.patch
|
||||||
|
|
||||||
# -debuginfo useless for (only) static libs
|
# -debuginfo useless for (only) static libs
|
||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
|
|
||||||
@ -39,6 +41,8 @@ This package contains files needed to develop applications using %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
%patch1 -p1 -b .multilib
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#ifarch x86_64
|
#ifarch x86_64
|
||||||
@ -86,6 +90,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 03 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.4-3
|
||||||
|
- multiarch conflicts (#341911)
|
||||||
|
|
||||||
* Fri Feb 08 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.4-2
|
* Fri Feb 08 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.4-2
|
||||||
- respin (gcc43)
|
- respin (gcc43)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user