rpms/libIDL/devel libIDL-0.8.6-multilib.patch, NONE, 1.1 libIDL.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19979

Modified Files:
	libIDL.spec 
Added Files:
	libIDL-0.8.6-multilib.patch 
Log Message:
multilib


libIDL-0.8.6-multilib.patch:
 libIDL-config-2.in |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE libIDL-0.8.6-multilib.patch ---
--- 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 at 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 at 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


Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libIDL.spec	11 Feb 2006 04:08:18 -0000	1.18
+++ libIDL.spec	23 May 2006 18:56:34 -0000	1.19
@@ -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 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .multilib
 
 %build
 %configure
@@ -73,6 +75,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Tue May 23 2006 Matthias Clasen <mclasen at redhat.com> - 0.8.6-3
+- Fix multilib conflicts
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-2.2.1
 - bump again for double-long bug on ppc(64)