rpms/gtk+/FC-6 gtk+-1.2.10-multilib.patch, NONE, 1.1 gtk+.spec, 1.4, 1.5

Thu Jan 11 16:31:03 UTC 2007

Author: rdieter

Update of /cvs/extras/rpms/gtk+/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19083

Modified Files:
	gtk+.spec 
Added Files:
	gtk+-1.2.10-multilib.patch 
Log Message:
* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-56
- multilib patch (#222298)
- cleanup auto*/libtool foo 
- drop old/deprecated bits


gtk+-1.2.10-multilib.patch:

--- NEW FILE gtk+-1.2.10-multilib.patch ---
--- 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@"
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
+prefix=`${PKG_CONFIG} --variable prefix gtk+`
+exec_prefix=`${PKG_CONFIG} --variable exec_prefix gtk+`
+libdir=`${PKG_CONFIG} --variable libdir gtk+`
+includedir=`${PKG_CONFIG} --variable includedir gtk+`
 exec_prefix_set=no
 
 usage()
@@ -91,14 +94,14 @@
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I at includedir@/gtk-1.2 $glib_cflags @x_cflags@ 
+      echo -I${includedir}/gtk-1.2 $glib_cflags @x_cflags@ 
 fi
 
 if test "$echo_libs" = "yes"; then
       my_glib_libs=
-      libdirs=-L at libdir@
+      libdirs=-L${libdir}
       for i in $glib_libs ; do
-        if test $i != -L at libdir@ ; then
+        if test $i != -L${libdir} ; then
           if test -z "$my_glib_libs" ; then
             my_glib_libs="$i"
           else


Index: gtk+.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk+/FC-6/gtk+.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk+.spec	29 Aug 2006 17:56:44 -0000	1.4
+++ gtk+.spec	11 Jan 2007 16:30:33 -0000	1.5
@@ -3,7 +3,7 @@
 Name: 	 gtk+
 Epoch:	 1
 Version: 1.2.10
-Release: 55%{?dist}
+Release: 56%{?dist}
 
 License: LGPL
 Group:	 System Environment/Libraries
@@ -61,37 +61,29 @@
 # Hack up the configure scripts to deal with some obscure
 # breakage with ancient libtool
 Patch29: gtk+-1.2.10-libtool.patch
-# Add a dependency on libgdk to libgtk
+# Add a dependency on libgdk to libgtk (#106677)
 Patch30: gtk+-1.2.10-gtkgdkdep.patch
 Patch31: gtk+-underquoted.patch
 Patch32: gtk+-1.2.10-ppc64.patch
 # do not allow for undefined symbols in shared libraries -- Rex
 Patch33: gtk+-1.2.10-no_undefined.patch
+# http://bugzilla.redhat.com/222298
+Patch34: gtk+-1.2.10-multilib.patch
 
 BuildRequires: glib-devel >= 1:%{version}
+## auto-req -- Rex
+#Requires:     glib >= 1:%{version}
 BuildRequires: automake14 autoconf213
 BuildRequires: libtool
 BuildRequires: gettext
-## This can theoretically be used for legacy -- Rex
-%if "%{?fedora}" > "4"
-BuildRequires: libX11-devel libXext-devel libXi-devel libXt-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define x_deps  libX11-devel libXext-devel libXi-devel libXt-devel
 %else
-BuildRequires: XFree86-devel
+%define x_deps	xorg-x11-devel
+## This can be used for legacy too -- Rex
+#define	x_deps	Xree86-devel
 %endif
-
-## *very* old, deprecated Obsoletes (pun intended) -- Rex
-#Obsoletes: gtk 
-## auto-req -- Rex
-#Requires: glib >= 1:%{version}
-
-# The highly broken gdk-pixbuf circular dependency is
-# added so that when you install gtk+, you get the 
-# dependencies you need for the Bluecurve GTK+-1.2 theme
-# engine that redhat-artwork installs without proper
-# dependencies.
-#
-## Ack, No-way, hosay.  -- Rex
-# Requires: gdk-pixbuf >= 0.18.0
+BuildRequires: %{x_deps} 
 
 %description
 The gtk+ package contains the GIMP ToolKit (GTK+), a library for
@@ -106,14 +98,7 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: glib-devel
 Requires: pkgconfig
-## this can theoretically be used for legacy -- Rex
-#if "%{?fedora}" > "4"
-Requires: libX11-devel, libXext-devel, libXi-devel
-#else
-#Requires: XFree86-devel
-#endif
-## *very* old, deprecated Obsoletes (pun intended) -- Rex
-#Obsoletes: gtk-devel < %{epoch}:%{version}
+Requires: %{x_deps} 
 ## info files not included
 #Requires(post): /sbin/install-info
 #Requires(preun): /sbin/install-info
@@ -150,28 +135,29 @@
 %patch31 -p1 -b .underquoted
 %patch32 -p1 -b .ppc64
 %patch33 -p1 -b .no_undefined
+%patch34 -p1 -b .multilib
 
-#libtoolize --force
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
 automake-1.4
-#aclocal-1.4
+aclocal-1.4
 autoconf-2.13
 autoheader-2.13
 
 
 %build
-LIBTOOL=/usr/bin/libtool \
 %configure \
   --disable-static \
   --with-xinput=xfree\
   --with-native-locale
 
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 #
 # Make cleaned-up versions of examples and tutorial for installation
@@ -214,7 +200,7 @@
 
 # I *know* ||: isn't needed, but this could end up used by legacy
 %check ||:
-make check LIBTOOL=/usr/bin/libtool
+make check 
 
 
 %clean
@@ -232,7 +218,8 @@
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/themes
 %{_datadir}/themes/Default/
-%config(noreplace) %{_sysconfdir}/gtk/
+%dir %{_sysconfdir}/gtk/
+%config(noreplace) %{_sysconfdir}/gtk/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -247,6 +234,11 @@
 
 
 %changelog
+* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-56
+- multilib patch (#222298)
+- cleanup auto*/libtool foo 
+- drop old/deprecated bits
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-55
 - fc6 respin
 


