rpms/glib/devel glib-1.2.10-multilib.patch, NONE, 1.1 glib.spec, 1.4, 1.5

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18506

Modified Files:
	glib.spec 
Added Files:
	glib-1.2.10-multilib.patch 
Log Message:
* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-24
- multilib patch (#222296)


glib-1.2.10-multilib.patch:

--- NEW FILE glib-1.2.10-multilib.patch ---
--- glib-1.2.10/glib-config.in.multilib	2007-01-11 10:00:48.000000000 -0500
+++ glib-1.2.10/glib-config.in	2007-01-11 10:13:25.000000000 -0500
@@ -1,7 +1,10 @@
 #!/bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
+prefix=`${PKG_CONFIG} --variable prefix glib`
+exec_prefix=`${PKG_CONFIG} --variable exec_prefix glib`
+libdir=`${PKG_CONFIG} --variable libdir glib`
+includedir=`${PKG_CONFIG} --variable includedir glib`
 exec_prefix_set=no
 
 usage()
@@ -88,7 +91,7 @@
 	if test "$lib_gthread" = "yes"; then
 		cflags="$cflags @G_THREAD_CFLAGS@"
 	fi
-	echo -I at includedir@/glib-1.2 -I at libdir@/glib/include $includes $cflags
+	echo -I${includedir}/glib-1.2 -I${libdir}/glib/include $includes $cflags
 fi
 if test "$echo_libs" = "yes"; then
 	libsp=""
@@ -104,5 +107,5 @@
 		libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
 		libsa="$libsa @G_MODULE_LIBS@"
 	fi
-	echo -L at libdir@ $libsp $libsa
+	echo -L${libdir} $libsp $libsa
 fi


Index: glib.spec
===================================================================
RCS file: /cvs/extras/rpms/glib/devel/glib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glib.spec	29 Aug 2006 17:55:59 -0000	1.4
+++ glib.spec	11 Jan 2007 16:06:47 -0000	1.5
@@ -3,7 +3,7 @@
 Name: 	 glib
 Epoch:	 1
 Version: 1.2.10
-Release: 23%{?dist}
+Release: 24%{?dist}
 
 License: LGPL
 Group:	 System Environment/Libraries
@@ -19,6 +19,7 @@
 Patch2: glib-1.2.10-gcc34.patch
 Patch3: glib-1.2.10-underquoted.patch
 Patch4: glib-1.2.10-no_undefined.patch
+Patch5: glib-1.2.10-multilib.patch
 
 %description
 GLib is a handy library of utility functions. This C library is
@@ -41,6 +42,7 @@
 %patch2 -p1 -b .gcc34
 %patch3 -p1 -b .underquoted
 %patch4 -p1 -b .no_undefined
+%patch5 -p1 -b .multilib
 
 #libtoolize --copy --force
 automake-1.4
@@ -59,7 +61,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-#makeinstall
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
 
 # libgmodule-1.2.so.0* missing eXecute bit
@@ -105,6 +106,9 @@
 
 
 %changelog
+* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-24
+- multilib patch (#222296)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-23
 - fc6 respin