diff --git a/gtk+-1.2.10-multilib.patch b/gtk+-1.2.10-multilib.patch index fad6e22..d0c3ad5 100644 --- a/gtk+-1.2.10-multilib.patch +++ b/gtk+-1.2.10-multilib.patch @@ -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 @@ diff -up gtk+-1.2.10/gtk-config.in.multilib gtk+-1.2.10/gtk-config.in 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 + diff --git a/gtk+.spec b/gtk+.spec index 686bea8..f1b7010 100644 --- a/gtk+.spec +++ b/gtk+.spec @@ -4,7 +4,7 @@ Summary: The GIMP ToolKit Name: gtk+ Epoch: 1 Version: 1.2.10 -Release: 64%{?dist} +Release: 65%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -242,8 +242,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 2 2008 Patrice Dumas 1:1.2.10-65 +- remove x_ldflags from gtk-config (#462650) + * Wed Oct 1 2008 Patrice Dumas 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 1:1.2.10-63 - patch_fuzz, fix build (#465033) @@ -498,7 +501,7 @@ rm -rf $RPM_BUILD_ROOT - Up Epoch and release * Wed Jul 19 2000 Owen Taylor -- Add BuildPreReq on glib = %{version} +- Add BuildPreReq on glib = %%{version} * Thu Jul 13 2000 Prospector - automatic rebuild @@ -613,7 +616,7 @@ rm -rf $RPM_BUILD_ROOT - Fixed Source: to point to v1.1 * Tue Aug 04 1998 Michael Fulbright -- change %postun to %preun +- change %%postun to %%preun * Mon Jun 27 1998 Shawn T. Amundson - Changed version to 1.1.0