diff --git a/libIDL-0.8.6-multilib.patch b/libIDL-0.8.6-multilib.patch new file mode 100644 index 0000000..769cbf3 --- /dev/null +++ b/libIDL-0.8.6-multilib.patch @@ -0,0 +1,39 @@ +--- libIDL-0.8.6/libIDL-config-2.in.multilib 2002-09-19 21:05:16.000000000 -0400 ++++ libIDL-0.8.6/libIDL-config-2.in 2006-05-23 14:52:15.000000000 -0400 +@@ -1,8 +1,11 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ ++name=libIDL-2.0 ++prefix=`pkg-config --variable prefix $name` ++exec_prefix=`pkg-config --variable exec_prefix $name` + exec_prefix_set=no ++includedir=`pkg-config --variable includedir $name` ++libdir=`pkg-config --variable libdir $name` + + usage() + { +@@ -46,11 +49,11 @@ + echo_exec_prefix=yes + ;; + --version) +- echo @LIBIDL_VERSION@ ++ pkg-config --modversion $name + exit 0 + ;; + --cflags) +- includes="-I@includedir@/libIDL-2.0" ++ includes="-I$includedir/libIDL-2.0" + echo_cflags=yes + ;; + --libs) +@@ -75,7 +78,7 @@ + all_flags="$all_flags $includes $cflags `pkg-config --cflags glib-2.0`" + fi + if test "$echo_libs" = "yes"; then +- all_flags="$all_flags -L@libdir@ -lIDL-2 `pkg-config --libs glib-2.0`" ++ all_flags="$all_flags -L$libdir -lIDL-2 `pkg-config --libs glib-2.0`" + fi + + # Straight out any possible duplicates, but be careful to diff --git a/libIDL.spec b/libIDL.spec index 4bb663e..828dc71 100644 --- a/libIDL.spec +++ b/libIDL.spec @@ -1,8 +1,9 @@ Summary: Library for parsing IDL (Interface Definition Language) Name: libIDL Version: 0.8.6 -Release: 2.2.1 +Release: 3 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2 +Patch0: libIDL-0.8.6-multilib.patch Group: System Environment/Libraries License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -31,6 +32,7 @@ or compile programs that use libIDL. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .multilib %build %configure @@ -73,6 +75,9 @@ rm -rf %{buildroot} %{_infodir}/libIDL2.info.gz %changelog +* Tue May 23 2006 Matthias Clasen - 0.8.6-3 +- Fix multilib conflicts + * Fri Feb 10 2006 Jesse Keating - 0.8.6-2.2.1 - bump again for double-long bug on ppc(64)