From 78b679b0bec49f847bfe4609b3b1614b624b2635 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 4 Jul 2013 13:37:21 -0400
Subject: [PATCH] 2.24.20

---
 .gitignore             |  1 +
 gtk2.spec              | 63 +++++++++++++-----------------------------
 sources                |  2 +-
 update-gtk-immodules   | 40 +++------------------------
 update-gtk-immodules.1 |  2 +-
 5 files changed, 26 insertions(+), 82 deletions(-)

diff --git a/.gitignore b/.gitignore
index c01e2d3..fd566a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ gtk+-2.21.5.tar.bz2
 /gtk+-2.24.17.tar.bz2
 /gtk+-2.24.18.tar.bz2
 /gtk+-2.24.19.tar.bz2
+/gtk+-2.24.20.tar.bz2
diff --git a/gtk2.spec b/gtk2.spec
index cb2c8f8..be0e2e1 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -17,8 +17,8 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
-Version: 2.24.19
-Release: 4%{?dist}
+Version: 2.24.20
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -28,20 +28,14 @@ Source2: update-gtk-immodules
 Source3: im-cedilla.conf
 Source4: update-gtk-immodules.1
 
-# Biarch changes
-Patch0: gtk-lib64.patch
 Patch1: system-python.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch2: icon-padding.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599618
 Patch8: tooltip-positioning.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=592582
-#Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=973730
-# https://bugzilla.gnome.org/show_bug.cgi?id=702455
-Patch16: 0001-printing-List-Avahi-printers.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -149,17 +143,15 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %prep
 %setup -q -n gtk+-%{version}
 
-%patch0 -p1 -b .lib64
 %patch1 -p1 -b .system-python
 %patch2 -p1 -b .icon-padding
 %patch8 -p1 -b .tooltip-positioning
-#%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .window-dragging
-%patch16 -p1 -b .avahi-printers
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
  %configure $CONFIGFLAGS \
+        --enable-man            \
 	--with-xinput=xfree	\
 	--enable-debug		\
 )
@@ -203,22 +195,6 @@ fi
 make install DESTDIR=$RPM_BUILD_ROOT        \
              RUN_QUERY_IMMODULES_TEST=false
 
-# man pages went missing, so install them manually
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-gzip -c docs/reference/gtk/gtk-query-immodules-2.0.1 > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-query-immodules-2.0.1.gz
-gzip -c docs/reference/gtk/gtk-update-icon-cache.1 > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-update-icon-cache.1.gz
-
-echo ".so man1/gtk-query-immodules-2.0.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-query-immodules-2.0-%{__isa_bits}.1
-
-gzip -c %{SOURCE4} > $RPM_BUILD_ROOT%{_mandir}/man1/update-gtk-immodules.1.gz
-
-# man pages went missing, so install them manually
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-gzip -c docs/reference/gtk/gtk-query-immodules-2.0.1 > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-query-immodules-2.0.1.gz
-gzip -c docs/reference/gtk/gtk-update-icon-cache.1 > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-update-icon-cache.1.gz
-
 echo ".so man1/gtk-query-immodules-2.0.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-query-immodules-2.0-%{__isa_bits}.1
 
 gzip -c %{SOURCE4} > $RPM_BUILD_ROOT%{_mandir}/man1/update-gtk-immodules.1.gz
@@ -226,7 +202,6 @@ gzip -c %{SOURCE4} > $RPM_BUILD_ROOT%{_mandir}/man1/update-gtk-immodules.1.gz
 %find_lang gtk20
 %find_lang gtk20-properties
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
 #
 # Make cleaned-up versions of tutorials, examples, and faq for installation
 #
@@ -247,7 +222,7 @@ done
 # for places where we have two copies of the GTK+ package installed.
 # (we might have x86_64 and i686 packages on the same system, for example.)
 case "$host" in
-  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+  alpha*|ia64*|ppc64*|powerpc64*|s390x*|x86_64*)
    mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
    ;;
   *)
@@ -267,41 +242,34 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/*/*.la
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gtk.immodules
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/immodules.cache
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems
 
-#
-# We need the substitution of $host so we use an external
-# file list
-#
-echo %dir %{_sysconfdir}/gtk-2.0/$host >> gtk20.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gtk.immodules >> gtk20.lang
 
 %post
 /sbin/ldconfig
-/usr/bin/update-gtk-immodules %{_host}
+gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 
 %post immodules
-/usr/bin/update-gtk-immodules %{_host}
+gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 
 %post immodule-xim
-/usr/bin/update-gtk-immodules %{_host}
+gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 
 %postun
 /sbin/ldconfig
 if [ $1 -gt 0 ]; then
-  /usr/bin/update-gtk-immodules %{_host}
+  gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 fi
 
 %postun immodules
-/usr/bin/update-gtk-immodules %{_host}
+gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 
 %postun immodule-xim
-/usr/bin/update-gtk-immodules %{_host}
+gtk-query-immodules-2.0-%{__isa_bits} --update-cache
 
 %files -f gtk20.lang
 %doc AUTHORS COPYING NEWS README
@@ -322,7 +290,7 @@ fi
 %{_datadir}/themes/Default
 %{_datadir}/themes/Emacs
 %{_datadir}/themes/Raleigh
-%dir %{_sysconfdir}/gtk-2.0
+%ghost %{_libdir}/gtk-2.0/%{bin_version}/immodules.cache
 %{_libdir}/girepository-1.0
 %{_mandir}/man1/gtk-query-immodules-2.0*
 %{_mandir}/man1/update-gtk-immodules.1.gz
@@ -340,6 +308,7 @@ fi
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so
 %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so
 %{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
+%dir %{_sysconfdir}/gtk-2.0
 %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
 %files immodule-xim
@@ -355,6 +324,7 @@ fi
 %{_bindir}/gtk-demo
 %{_datadir}/gtk-2.0
 %{_datadir}/gir-1.0
+%{_mandir}/man1/gtk-builder-convert.1.gz
 
 %files devel-docs
 %{_datadir}/gtk-doc
@@ -365,6 +335,11 @@ fi
 %doc tmpdocs/examples
 
 %changelog
+* Thu Jul  4 2013 Matthias Clasen <mclasen@redhat.com> - 2.24.10-1
+- Update to 2.24.10
+- Make immodule cache handling the same as in gtk3. The cache
+  file is now in $libdir, no longer in /etc
+
 * Wed Jun 26 2013 Matthias Clasen <mclasen@redhat.com> - 2.24.19-4
 - Include man pages again
 - Add a man page for update-gtk-immodules
diff --git a/sources b/sources
index 26febbf..0e5805a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5786fe56aeb777a657bcfb38874401c6  gtk+-2.24.19.tar.bz2
+84ffeb0b0f0c92b8369068984da4c295  gtk+-2.24.20.tar.bz2
diff --git a/update-gtk-immodules b/update-gtk-immodules
index fbc743f..0837a77 100755
--- a/update-gtk-immodules
+++ b/update-gtk-immodules
@@ -6,44 +6,12 @@ if test $# != 1; then
 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/"`
-# autoconf uses ibm-linux not redhat-linux (s390x)
-host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
-
-# 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* 2>/dev/null); do
-           host=$(basename $d)
-           break
-         done
-     ;;
-   esac
-   [ -d /etc/gtk-2.0/$host ] || exit 0
-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
+  alpha*|ia64*|ppc64*|powerpc64*|s390x*|x86_64*)
+   /usr/bin/gtk-query-immodules-2.0-64 --update-cache
    ;;
   *)
-   /usr/bin/gtk-query-immodules-2.0-32 > $FILE
+   /usr/bin/gtk-query-immodules-2.0-32 --update-cache
    ;;
 esac
diff --git a/update-gtk-immodules.1 b/update-gtk-immodules.1
index 19c086c..84f8eb0 100644
--- a/update-gtk-immodules.1
+++ b/update-gtk-immodules.1
@@ -46,7 +46,7 @@ as the host triplet that GTK+ was configured with.
 
 .SH "FILES"
 .PP
-/etc/gtk-2.0/\fIhost\fR/gtk.immodules - the file created by update-gtk-immodules.
+$libdir/gtk-2.0/2.10.0/immodules.cache - the file created by update-gtk-immodules.
 
 .SH "SEE ALSO"
 .BR gtk-query-immodules-2.0 "(1)"