rpms/gtk+/devel gtk+-1.2.10-multilib.patch, 1.1, 1.2 gtk+.spec, 1.10, 1.11

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/gtk+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31769

Modified Files:
	gtk+-1.2.10-multilib.patch gtk+.spec 
Log Message:
* Mon Feb 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-61
- fix multilib patch (#341401)


gtk+-1.2.10-multilib.patch:

Index: gtk+-1.2.10-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+/devel/gtk+-1.2.10-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-1.2.10-multilib.patch	11 Jan 2007 16:24:58 -0000	1.1
+++ gtk+-1.2.10-multilib.patch	18 Feb 2008 16:54:53 -0000	1.2
@@ -1,12 +1,22 @@
---- gtk+-1.2.10/gtk-config.in.multilib	2007-01-11 10:22:17.000000000 -0500
-+++ gtk+-1.2.10/gtk-config.in	2007-01-11 10:33:01.000000000 -0500
-@@ -5,8 +5,11 @@
- glib_thread_libs="@glib_thread_libs@"
- glib_thread_cflags="@glib_thread_cflags@"
+diff -up gtk+-1.2.10/gtk-config.in.multilib gtk+-1.2.10/gtk-config.in
+--- gtk+-1.2.10/gtk-config.in.multilib	2000-10-21 13:20:40.000000000 -0500
++++ gtk+-1.2.10/gtk-config.in	2008-02-18 10:49:03.000000000 -0600
+@@ -1,12 +1,16 @@
+ #!/bin/sh
+ 
+-glib_libs="@glib_libs@"
+-glib_cflags="@glib_cflags@"
+-glib_thread_libs="@glib_thread_libs@"
+-glib_thread_cflags="@glib_thread_cflags@"
++[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
  
 -prefix=@prefix@
 -exec_prefix=@exec_prefix@
-+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
++glib_libs=`${PKG_CONFIG} --libs glib gmodule`
++glib_cflags=`${PKG_CONFIG} --cflags glib gmodule`
++glib_thread_libs=`${PKG_CONFIG} --libs gthread`
++glib_thread_cflags=`${PKG_CONFIG} --cflags gthread`
++
 +prefix=`${PKG_CONFIG} --variable prefix gtk+`
 +exec_prefix=`${PKG_CONFIG} --variable exec_prefix gtk+`
 +libdir=`${PKG_CONFIG} --variable libdir gtk+`
@@ -14,7 +24,7 @@
  exec_prefix_set=no
  
  usage()
-@@ -91,14 +94,14 @@
+@@ -91,14 +95,14 @@ if test "$lib_gthread" = "yes"; then
  fi
  
  if test "$echo_cflags" = "yes"; then


Index: gtk+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+/devel/gtk+.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk+.spec	11 Feb 2008 13:29:35 -0000	1.10
+++ gtk+.spec	18 Feb 2008 16:54:53 -0000	1.11
@@ -3,7 +3,7 @@
 Name: 	 gtk+
 Epoch:	 1
 Version: 1.2.10
-Release: 60%{?dist}
+Release: 61%{?dist}
 
 License: LGPLv2+
 Group:	 System Environment/Libraries
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Mon Feb 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-61
+- fix multilib patch (#341401)
+
 * Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-60 
 - respin (gcc43)