From 4a0c875022d8aad63463e4d776582846174880fd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 22 Jan 2007 19:23:46 +0000
Subject: [PATCH] clean up patches in cvs

---
 .cvsignore                |  1 +
 gtk2.spec                 | 14 +++++-------
 sources                   |  3 +--
 update-gdk-pixbuf-loaders | 46 +++++++++++++++++++++++++++++++++++++++
 update-gtk-immodules      | 46 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 99 insertions(+), 11 deletions(-)
 create mode 100755 update-gdk-pixbuf-loaders
 create mode 100755 update-gtk-immodules

diff --git a/.cvsignore b/.cvsignore
index 862e96e..1564d65 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -47,3 +47,4 @@ gtk+-2.10.4.tar.bz2
 gtk+-2.10.6.tar.bz2
 gtk+-2.10.7.tar.bz2
 gtk+-2.10.8.tar.bz2
+gtk+-2.10.9.tar.bz2
diff --git a/gtk2.spec b/gtk2.spec
index 0111a02..41fab41 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -10,7 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.10.8
+%define base_version 2.10.9
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -20,7 +20,8 @@ Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
-Source1: update-scripts.tar.gz
+Source1: update-gdk-pixbuf-loaders
+Source2: update-gtk-immodules 
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
@@ -36,7 +37,6 @@ Patch7: gtk+-2.10.7-cursor-blink.patch
 
 # fixed in upstream cvs
 Patch10: gtk+-2.10.4-im-reset.patch
-Patch11: gtk+-2.10.8-recent-menu-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -115,17 +115,13 @@ docs for the GTK+ widget toolkit.
 %prep
 %setup -q -n gtk+-%{version}
 
-tar xzf %{SOURCE1}
-
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .search
 %patch3 -p1 -b .fam
 
 %patch7 -p1 -b .cursor-blink
-
 %patch10 -p1 -b .im-reset
-%patch11 -p1 -b .recent-menu-crash
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -230,8 +226,8 @@ esac
 #
 # Install wrappers for the binaries
 #
-cp update-gtk-immodules $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
-cp update-gdk-pixbuf-loaders $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
 
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
diff --git a/sources b/sources
index 6cbab08..aadddf4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-25e73f5bdf6a1272799d0536a869f645  update-scripts.tar.gz
-46bfef60f02c39acdcdba2ac46825db4  gtk+-2.10.8.tar.bz2
+20d763198efb38263b22dee347f69da6  gtk+-2.10.9.tar.bz2
diff --git a/update-gdk-pixbuf-loaders b/update-gdk-pixbuf-loaders
new file mode 100755
index 0000000..5abd80a
--- /dev/null
+++ b/update-gdk-pixbuf-loaders
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+if test $# != 1; then
+  echo usage: update-gdk-pixbuf-loaders host_triplet 1>&2
+  exit 1
+fi
+
+umask 022
+# Deriving /etc/gtk-2.0/$host location
+#
+# autoconf changes linux to linux-gnu
+case "$1" in
+  *linux) host="$1-gnu"
+  ;;
+  *) host=$1
+  ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+# We have had problems in the past with build systems
+# changing host from i386 to i686 and appending/dropping
+# the -gnu suffix, so try to match up the $host we got
+# with whats actually there.
+if [ ! -d /etc/gtk-2.0/$host ]; then 
+   case "$host" in
+     i?86*) 
+         for d in $(ls -d /etc/gtk-2.0/i?86*); do
+           host=$(basename $d)
+           break
+         done
+     ;;
+   esac
+fi 
+
+FILE=/etc/gtk-2.0/$host/gdk-pixbuf.loaders
+
+case "$host" in
+  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+   /usr/bin/gdk-pixbuf-query-loaders-64 > $FILE
+   ;;
+  *)
+   /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE
+   ;;
+esac
diff --git a/update-gtk-immodules b/update-gtk-immodules
new file mode 100755
index 0000000..6cae58d
--- /dev/null
+++ b/update-gtk-immodules
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+if test $# != 1; then
+  echo usage: update-gtk-immodules host_triplet 1>&2
+  exit 1
+fi
+ 
+umask 022
+# Deriving /etc/gtk-2.0/$host location
+#
+# autoconf changes linux to linux-gnu
+case "$1" in
+  *linux) host="$1-gnu"
+  ;;
+  *) host=$1
+  ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+# We have had problems in the past with build systems
+# changing host from i386 to i686 and appending/dropping
+# the -gnu suffix, so try to match up the $host we got
+# with whats actually there.
+if [ ! -d /etc/gtk-2.0/$host ]; then
+   case "$host" in
+     i?86*)
+         for d in $(ls -d /etc/gtk-2.0/i?86*); do
+           host=$(basename $d)
+           break
+         done
+     ;;
+   esac
+fi
+
+FILE=/etc/gtk-2.0/$host/gtk.immodules
+
+case "$host" in
+  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+   /usr/bin/gtk-query-immodules-2.0-64 > $FILE
+   ;;
+  *)
+   /usr/bin/gtk-query-immodules-2.0-32 > $FILE
+   ;;
+esac