rpms/gtk+/devel gtk+-1.2.10-multilib.patch, 1.2, 1.3 gtk+.spec, 1.16, 1.17

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/gtk+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31278

Modified Files:
	gtk+-1.2.10-multilib.patch gtk+.spec 
Log Message:
* Thu Oct  2 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-65
- remove x_ldflags from gtk-config (#462650)


gtk+-1.2.10-multilib.patch:

Index: gtk+-1.2.10-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk+/devel/gtk+-1.2.10-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk+-1.2.10-multilib.patch	18 Feb 2008 16:54:53 -0000	1.2
+++ gtk+-1.2.10-multilib.patch	2 Oct 2008 08:31:28 -0000	1.3
@@ -1,6 +1,6 @@
 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
+--- gtk+-1.2.10/gtk-config.in.multilib	2000-10-21 20:20:40.000000000 +0200
++++ gtk+-1.2.10/gtk-config.in	2008-10-02 09:52:59.000000000 +0200
 @@ -1,12 +1,16 @@
  #!/bin/sh
  
@@ -42,3 +42,11 @@
            if test -z "$my_glib_libs" ; then
              my_glib_libs="$i"
            else
+@@ -107,6 +111,6 @@ if test "$echo_libs" = "yes"; then
+         fi
+       done
+ 
+-      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
+ fi      
+ 


Index: gtk+.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk+/devel/gtk+.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtk+.spec	1 Oct 2008 20:26:13 -0000	1.16
+++ gtk+.spec	2 Oct 2008 08:31:28 -0000	1.17
@@ -4,7 +4,7 @@
 Name: 	 gtk+
 Epoch:	 1
 Version: 1.2.10
-Release: 64%{?dist}
+Release: 65%{?dist}
 
 License: LGPLv2+
 Group:	 System Environment/Libraries
@@ -242,8 +242,11 @@
 
 
 %changelog
+* Thu Oct  2 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-65
+- remove x_ldflags from gtk-config (#462650)
+
 * Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-64
-- copy config.* from rpm directory, those shpped with gtk+ are too old
+- copy config.* from rpm directory, those shipped with gtk+ are too old
 
 * Wed Oct 01 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-63
 - patch_fuzz, fix build (#465033)
@@ -498,7 +501,7 @@
 - Up Epoch and release
 
 * Wed Jul 19 2000 Owen Taylor <otaylor at redhat.com>
-- Add BuildPreReq on glib = %{version}
+- Add BuildPreReq on glib = %%{version}
 
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
@@ -613,7 +616,7 @@
 - Fixed Source: to point to v1.1 
 
 * Tue Aug 04 1998 Michael Fulbright <msf at redhat.com>
-- change %postun to %preun
+- change %%postun to %%preun
 
 * Mon Jun 27 1998 Shawn T. Amundson
 - Changed version to 1.1.0