From 50dcefffe821bce8272996e1464c75174ee1e986 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 3 Feb 2009 03:40:38 +0000
Subject: [PATCH] 2.15.3

---
 .cvsignore                           |  2 +-
 gtk-2.15.1-scale-marks-crasher.patch | 14 --------------
 gtk2.spec                            | 10 +++++-----
 sources                              |  2 +-
 togglebutton-crash.patch             | 14 --------------
 5 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 gtk-2.15.1-scale-marks-crasher.patch
 delete mode 100644 togglebutton-crash.patch

diff --git a/.cvsignore b/.cvsignore
index 14d28c5..ca93d6b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk+-2.15.2.tar.bz2
+gtk+-2.15.3.tar.bz2
diff --git a/gtk-2.15.1-scale-marks-crasher.patch b/gtk-2.15.1-scale-marks-crasher.patch
deleted file mode 100644
index 0e161f7..0000000
--- a/gtk-2.15.1-scale-marks-crasher.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: gtk/gtkrange.c
-===================================================================
---- gtk/gtkrange.c	(revision 22222)
-+++ gtk/gtkrange.c	(working copy)
-@@ -1225,7 +1225,9 @@
-   if (range->layout->n_marks)
-     {
-       g_free (range->layout->marks);
-+      range->layout->marks = NULL;
-       g_free (range->layout->mark_pos);
-+      range->layout->mark_pos = NULL;
-       range->layout->n_marks = 0;
-     }
- 
diff --git a/gtk2.spec b/gtk2.spec
index d4a178a..9445235 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.15.2
+%define base_version 2.15.3
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
@@ -30,8 +30,6 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
-# fixed upstream
-Patch4: togglebutton-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -126,7 +124,6 @@ GTK+ widget toolkit.
 %patch0 -p1 -b .lib64
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
-%patch4 -p0 -b .togglebutton-crash
 
 %build
 libtoolize --force --copy
@@ -323,6 +320,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Feb  2 2009 Matthias Clasen <mclasen@redhat.com> - 2.15.3-1
+- Update to 2.15.3
+
 * Thu Jan 29 2009 Matthias Clasen <mclasen@redhat.com> - 2.15.2-4
 - Split of an immodules subpackage (#444814)
 - Disable ia64 hack thats not needed in Fedora
diff --git a/sources b/sources
index 4ea4481..f3e4d90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c230eeb1bf24b69b480d0a35da34794  gtk+-2.15.2.tar.bz2
+e490d990f170e78555f84133f4aafdfe  gtk+-2.15.3.tar.bz2
diff --git a/togglebutton-crash.patch b/togglebutton-crash.patch
deleted file mode 100644
index 96b894c..0000000
--- a/togglebutton-crash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: gtk/gtktogglebutton.c
-===================================================================
---- gtk/gtktogglebutton.c	(revision 22218)
-+++ gtk/gtktogglebutton.c	(working copy)
-@@ -502,7 +502,8 @@
- 
-   g_object_notify (G_OBJECT (toggle_button), "active");
- 
--  GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
-+  if (GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked)
-+    GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
- }
- 
- static void