From fe3f93a1579cb626aaf4d6fff1879c98791a43df Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sat, 23 Sep 2006 21:07:14 +0000
Subject: [PATCH] 2.10.4

---
 .cvsignore          |  1 +
 add-translations.pl | 60 +++++++++++++++++++++++++++++++++++++++++++++
 gtk2.spec           | 37 ++++++++--------------------
 sources             |  2 +-
 4 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c449063..254eb81 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -43,3 +43,4 @@ gtk+-2.10.0.tar.bz2
 gtk+-2.10.1.tar.bz2
 gtk+-2.10.2.tar.bz2
 gtk+-2.10.3.tar.bz2
+gtk+-2.10.4.tar.bz2
diff --git a/add-translations.pl b/add-translations.pl
index ad22654..bccf706 100644
--- a/add-translations.pl
+++ b/add-translations.pl
@@ -3,360 +3,420 @@
 
 open (FILE, '>>', 'be.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на вузьле %2$s"
 EOT
 
 open (FILE, '>>', 'bg.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'bn_IN.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s'র উপর"
 EOT
 
 open (FILE, '>>', 'bn.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s'র উপর"
 EOT
 
 open (FILE, '>>', 'br.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s war %2$s"
 EOT
 
 open (FILE, '>>', 'ca.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s a %2$s"
 EOT
 
 open (FILE, '>>', 'cs.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'cy.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s ar %2$s"
 EOT
 
 open (FILE, '>>', 'da.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'de.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s"
 EOT
 
 open (FILE, '>>', 'dz.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s གུ"
 EOT
 
 open (FILE, '>>', 'el.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s σε %2$s"
 EOT
 
 open (FILE, '>>', 'en_CA.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 EOT
 
 open (FILE, '>>', 'en_GB.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 EOT
 
 open (FILE, '>>', 'es.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 EOT
 
 open (FILE, '>>', 'et.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s hostil %1$s"
 EOT
 
 open (FILE, '>>', 'eu.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s"
 EOT
 
 open (FILE, '>>', 'fi.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s - %2$s"
 EOT
 
 open (FILE, '>>', 'fr.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s sur %2$s"
 EOT
 
 open (FILE, '>>', 'gl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 EOT
 
 open (FILE, '>>', 'gu.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s પર"
 EOT
 
 open (FILE, '>>', 'he.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "‏%1$s ב-%2$s"
 EOT
 
 open (FILE, '>>', 'hi.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$s पर"
 EOT
 
 open (FILE, '>>', 'hu.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s ezen: %2$s"
 EOT
 
 open (FILE, '>>', 'id.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s pada %2$s"
 EOT
 
 open (FILE, '>>', 'it.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s su %2$s"
 EOT
 
 open (FILE, '>>', 'ja.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s にある %1$s"
 EOT
 
 open (FILE, '>>', 'ka.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s - %2$s"
 EOT
 
 open (FILE, '>>', 'ko.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%s %s"
 EOT
 
 open (FILE, '>>', 'ku.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s di %2$s de"
 EOT
 
 open (FILE, '>>', 'lt.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s kompiuteryje %2$s"
 EOT
 
 open (FILE, '>>', 'lv.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s uz %2$s"
 EOT
 
 open (FILE, '>>', 'mg.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s amin'ny %2$s"
 EOT
 
 open (FILE, '>>', 'mk.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'ml.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s-ല്‍ %1$s"
 EOT
 
 open (FILE, '>>', 'mn.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s"
 EOT
 
 open (FILE, '>>', 'mr.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%s, %s"
 EOT
 
 open (FILE, '>>', 'nb.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'nl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s op %2$s"
 EOT
 
 open (FILE, '>>', 'nn.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'or.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$sରେ"
 EOT
 
 open (FILE, '>>', 'pa.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s ਉੱਤੇ %1$s"
 EOT
 
 open (FILE, '>>', 'pl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'pt_BR.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s em %2$s"
 EOT
 
 open (FILE, '>>', 'pt.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s em %2$s"
 EOT
 
 open (FILE, '>>', 'ro.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s pe %2$s"
 EOT
 
 open (FILE, '>>', 'ru.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'sk.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'sl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'sq.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s mbi %2$s"
 EOT
 
 open (FILE, '>>', 'sr@Latn.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'sr.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'sv.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'ta.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 EOT
 
 open (FILE, '>>', 'th.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s ที่ %2$s"
 EOT
 
 open (FILE, '>>', 'uk.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'vi.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s trên %2$s"
 EOT
 
 open (FILE, '>>', 'zh_CN.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 EOT
 
 open (FILE, '>>', 'zh_HK.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s 於 %2$s"
 EOT
 
 open (FILE, '>>', 'zh_TW.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s 於 %2$s"
 EOT
diff --git a/gtk2.spec b/gtk2.spec
index ea32059..983a148 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -10,41 +10,29 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.10.3
+%define base_version 2.10.4
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
 Source1: update-scripts.tar.gz
-# This script belongs to patch 13
-Source2: add-translations.pl
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Filechooser search
-Patch2: gtk+-2.10.3-search.patch
+Patch2: gtk+-2.10.4-search.patch
 # use fam for recent-files
 Patch3: gtk+-2.10.3-fam.patch
 
 # backport from HEAD
 Patch7: gtk+-2.10.2-cursor-blink.patch
-Patch8: gtk+-2.10.2-im-reset.patch
-
-# fixed in upstream cvs
-Patch9: gtk+-2.10.3-sylpheed-crash.patch
-Patch10: gtk+-2.10.3-desktop.patch
-Patch11: gtk+-2.10.3-gedit-color-picker.patch
-Patch12: gtk+-2.10.3-parent-walk.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=354887
-Patch13: gtk+-2.10.3-auth-dialogs.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -65,8 +53,6 @@ BuildRequires: libXfixes-devel
 BuildRequires: libXinerama-devel
 # for patch 3
 BuildRequires: gamin-devel
-# for Source2
-BuildRequires: perl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gtk+-gtkbeta
@@ -111,6 +97,7 @@ Requires: cairo-devel >= %{cairo_version}
 Requires: libX11-devel, libXcursor-devel, libXinerama-devel
 Requires: libXext-devel, libXi-devel, libXrandr-devel
 Requires: libXfixes-devel
+Requires: pkgconfig
 Obsoletes: gtk+-gtkbeta-devel
 Obsoletes: Inti-devel
 ## avoid header collisions
@@ -132,16 +119,6 @@ tar xzf %{SOURCE1}
 %patch3 -p1 -b .fam
 
 %patch7 -p0 -b .cursor-blink
-%patch8 -p1 -b .im-reset
-%patch9 -p1 -b .sylpheed-crash
-%patch10 -p1 -b .desktop
-%patch11 -p1 -b .gedit-color-picker
-%patch12 -p1 -b .parent-walk
-%patch13 -p1 -b .auth-dialogs
-
-pushd po/
-perl %{SOURCE2}
-popd
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -315,6 +292,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc tmpdocs/examples
 
 %changelog
+* Sat Sep 23 2006 Matthias Clasen <mclasen@redhat.com> - 2.10.4-1
+- Update to 2.10.4
+- Drop upstreamed patches
+- Update the search patch
+- Require pkgconfig in the -devel package
+
 * Tue Sep 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.10.3-7
 - Fix issues with auth dialogs in the file chooser
 
diff --git a/sources b/sources
index 73536f1..dc9a19a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-c662ca204e204edfd8b8b917b9a852aa  gtk+-2.10.3.tar.bz2
+ecfcbdc0d23eb7a596b1d58b48838b18  gtk+-2.10.4.tar.bz2