rpms/giblib/devel giblib-1.2.4-multilib.patch, NONE, 1.1 giblib.spec, 1.15, 1.16

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/giblib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533

Modified Files:
	giblib.spec 
Added Files:
	giblib-1.2.4-multilib.patch 
Log Message:
Fix multilib conflict in the config script.


giblib-1.2.4-multilib.patch:

--- NEW FILE giblib-1.2.4-multilib.patch ---
diff -Naupr giblib-1.2.4.orig/giblib-config.in giblib-1.2.4/giblib-config.in
--- giblib-1.2.4.orig/giblib-config.in	2004-09-04 16:40:40.000000000 +0200
+++ giblib-1.2.4/giblib-config.in	2008-12-21 18:36:40.282246819 +0100
@@ -4,6 +4,17 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 
+# Fedora specific hack to share the same script on all archs
+ARCH=$(uname -m)
+case ${ARCH} in
+x86_64|ia64|s390)
+  lib_dir=@prefix@/lib64
+  ;;
+*)
+  lib_dir=@prefix@/lib
+  ;;
+esac
+
 usage="\
 Usage: giblib-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
 
@@ -45,8 +56,7 @@ while test $# -gt 0; do
       echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@
+      echo -L${lib_dir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
       ;;
     *)
       echo "${usage}" 1>&2


Index: giblib.spec
===================================================================
RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- giblib.spec	20 Feb 2008 04:09:13 -0000	1.15
+++ giblib.spec	21 Dec 2008 17:41:43 -0000	1.16
@@ -1,11 +1,12 @@
 Summary: Simple library and a wrapper for imlib2
 Name: giblib
 Version: 1.2.4
-Release: 11
+Release: 12
 License: MIT
 Group: System Environment/Libraries
 URL: http://linuxbrit.co.uk/giblib/
 Source: http://linuxbrit.co.uk/downloads/giblib-%{version}.tar.gz
+Patch0: giblib-1.2.4-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imlib2-devel
 
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -67,7 +69,10 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-11
+* Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 1.2.4-12
+- Fix multilib conflict in the config script.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.2.4-10