From 6df35ae4e24ce6535cc66b76abb2443290cf3ccb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jan 08 2008 15:51:45 +0000
Subject: 2.12.4


---

diff --git a/.cvsignore b/.cvsignore
index 1ca9d7a..0dd8c10 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk+-2.12.3.tar.bz2
+gtk+-2.12.4.tar.bz2
diff --git a/atomiclookup-collision.patch b/atomiclookup-collision.patch
deleted file mode 100644
index 3df776c..0000000
--- a/atomiclookup-collision.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gtk+-2.12.3/gtk-doc.make.atomiclookup-collision gtk+-2.12.3/gtk-doc.make
---- gtk+-2.12.3/gtk-doc.make.atomiclookup-collision	2007-12-18 13:36:12.000000000 -0500
-+++ gtk+-2.12.3/gtk-doc.make	2007-12-18 13:36:42.000000000 -0500
-@@ -128,6 +128,7 @@ maintainer-clean-local: clean
- 	cd $(srcdir) && rm -rf xml html
- 
- install-data-local:
-+	ls $(srcdir)/html > /dev/null; \
- 	installfiles=`echo $(srcdir)/html/*`; \
- 	if test "$$installfiles" = '$(srcdir)/html/*'; \
- 	then echo '-- Nothing to install' ; \
diff --git a/gtk2.spec b/gtk2.spec
index 4dda675..6c8c4c9 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.12.3
+%define base_version 2.12.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: 5%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -34,17 +34,8 @@ Patch2: workaround.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=488119
 Patch3: system-log-crash.patch
 
-# fixed in upstream svn
-Patch4: tab-label.patch
-
 # backport from svn trunk
-Patch5: im-setting.patch
-
-# fix a gtk-doc issue
-Patch6: gtkdoc-rebase.patch
-
-# work around a kernel bug on build systems
-Patch7: atomiclookup-collision.patch
+Patch4: im-setting.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -124,10 +115,7 @@ docs for the GTK+ widget toolkit.
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .system-log-crash
-%patch4 -p1 -b .tab-label
-%patch5 -p1 -b .im-setting
-%patch6 -p1 -b .gtkdoc-rebase
-%patch7 -p1 -b .atomiclookup-collision
+%patch4 -p1 -b .im-setting
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -310,6 +298,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Jan  8 2008 Matthias Clasen  <mclasen@redhat.com> - 2.13.4-1
+- Update to 2.12.4
+- Drop obsolete patches
+
 * Wed Dec 19 2007 Colin Walters <walters@redhat.com> - 2.12.3-5
 - BR libXcomposite-devel so we get the sexiness, also pull it in
   in the devel package.
diff --git a/gtkdoc-rebase.patch b/gtkdoc-rebase.patch
deleted file mode 100644
index 3397df0..0000000
--- a/gtkdoc-rebase.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up gtk+-2.12.3/gtk-doc.make.rebase gtk+-2.12.3/gtk-doc.make
---- gtk+-2.12.3/gtk-doc.make.rebase	2007-12-18 12:09:09.000000000 -0500
-+++ gtk+-2.12.3/gtk-doc.make	2007-12-18 12:11:22.000000000 -0500
-@@ -139,9 +139,8 @@ install-data-local:
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  if test "`which gtkdoc-rebase`" != ""; then \
--        gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
--	  fi \
-+	  which gtkdoc-rebase > /dev/null && \
-+            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- 	fi
- 	
- 
diff --git a/sources b/sources
index c907b04..8986b08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc8455144f27945f2fcbe91e75acd118  gtk+-2.12.3.tar.bz2
+72e2a930f65667ab86dc46141bbaf9e2  gtk+-2.12.4.tar.bz2
diff --git a/tab-label.patch b/tab-label.patch
deleted file mode 100644
index c772c12..0000000
--- a/tab-label.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up gtk+-2.12.3/gtk/gtknotebook.c.tab-label gtk+-2.12.3/gtk/gtknotebook.c
---- gtk+-2.12.3/gtk/gtknotebook.c.tab-label	2007-12-11 14:00:13.000000000 -0500
-+++ gtk+-2.12.3/gtk/gtknotebook.c	2007-12-11 14:00:34.000000000 -0500
-@@ -4349,12 +4349,15 @@ gtk_notebook_real_remove (GtkNotebook *n
-   gtk_widget_unparent (page->child);
- 
-   tab_label = page->tab_label;
--  g_object_ref (tab_label);
--  gtk_notebook_remove_tab_label (notebook, page);
--  if (destroying)
--    gtk_widget_destroy (tab_label);
--  g_object_unref (tab_label);
--  
-+  if (tab_label)
-+    {
-+      g_object_ref (tab_label);
-+      gtk_notebook_remove_tab_label (notebook, page);
-+      if (destroying)
-+        gtk_widget_destroy (tab_label);
-+      g_object_unref (tab_label);
-+    }
-+
-   if (notebook->menu)
-     {
-       gtk_container_remove (GTK_CONTAINER (notebook->menu),