From a7ae4546f8169b0a1553fcbafc6d0a3dd401b9ed Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sat, 30 May 2009 02:10:03 +0000
Subject: [PATCH] 2.17.1

---
 .cvsignore       |  2 +-
 gtk2.spec        |  9 ++++-----
 sources          |  2 +-
 workaround.patch | 12 ------------
 4 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 workaround.patch

diff --git a/.cvsignore b/.cvsignore
index 3a47327..71bcfa0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk+-2.17.0.tar.bz2
+gtk+-2.17.1.tar.bz2
diff --git a/gtk2.spec b/gtk2.spec
index 09464f3..c736663 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -11,7 +11,7 @@
 %define libpng_version 2:1.2.2-16
 %define xrandr_version 1.2.99.4-2
 
-%define base_version 2.17.0
+%define base_version 2.17.1
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -26,9 +26,6 @@ Source2: update-gtk-immodules
 
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
-# a workaround for some brokenness in the flash plugin
-# see http://bugzilla.gnome.org/show_bug.cgi?id=463773
-Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
 
@@ -140,7 +137,6 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
-%patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
@@ -374,6 +370,9 @@ fi
 
 
 %changelog
+* Fri May 29 2009 Matthias Clasen <mclasen@redhat.com> - 2.17.1-1
+- Update to 2.17.1
+
 * Tue May 26 2009 Matthias Clasen <mclasen@redhat.com> - 2.17.0-2
 - Update the immodules files in %%postun (#502420)
 - Ship the xim immodule separately
diff --git a/sources b/sources
index 6fda3e4..04187f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1a1f0b66a240c31cb2733643f9170ba  gtk+-2.17.0.tar.bz2
+ba8f8bf549be224b124a9efa745d9240  gtk+-2.17.1.tar.bz2
diff --git a/workaround.patch b/workaround.patch
deleted file mode 100644
index 7beccc3..0000000
--- a/workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
-===================================================================
---- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
-@@ -287,6 +287,7 @@
- gtk_clipboard_get_for_display (GdkDisplay *display, 
- 			       GdkAtom     selection)
- {
-+  g_return_val_if_fail (display != NULL, NULL);
-   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-   g_return_val_if_fail (!display->closed, NULL);
-