From 7851be49c6951033a4a27209a8263d0d8e33b23d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 11 Apr 2005 05:45:26 +0000
Subject: [PATCH] 2.6.6

---
 .cvsignore |  1 +
 gtk2.spec  | 14 ++++++--------
 sources    |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 72a5d81..cde3b6b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ gtk+-2.6.2.tar.bz2
 gtk+-2.6.3.tar.bz2
 gtk+-2.6.4.tar.bz2
 gtk+-2.6.5.tar.bz2
+gtk+-2.6.6.tar.gz
diff --git a/gtk2.spec b/gtk2.spec
index e3f16d3..d8f0ea4 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -8,13 +8,13 @@
 %define atk_version %{atk_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.6.5
+%define base_version 2.6.6
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -24,10 +24,6 @@ Source1: update-scripts.tar.gz
 Patch1: gtk+-2.3.2-themename.patch
 # Biarch changes
 Patch2: gtk+-2.4.1-lib64.patch
-# Fixed in 2.6.6
-Patch3: gtk+-2.6.5-input.patch
-# Fixed in 2.6.6
-Patch4: gtk+-2.6.5-stock-icon.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -87,8 +83,6 @@ docs for the GTK+ widget toolkit.
 
 %patch1 -p1 -b .themename
 %patch2 -p1 -b .lib64
-%patch3 -p1 -b .input
-%patch4 -p0 -b .icons
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -263,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc tmpdocs/examples
 
 %changelog
+* Mon Apr 11 2005 Matthias Clasen <mclasen@redhat.com> - 2.6.6-1
+- Update to 2.6.6
+- Drop upstreamed patches
+
 * Sun Apr 10 2005 Jeremy Katz <katzj@redhat.com> - 2.6.5-2
 - add patch from upstream CVS for broken icons (#154340, bgo#169870)
 
diff --git a/sources b/sources
index 7a5f937..74257af 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 cc70205392e209ae73eff74e020111f2  update-scripts.tar.gz
-3f52f64bdbd132eccfee2de5d2124190  gtk+-2.6.5.tar.bz2
+d6ac841de158e03c0baa72476521cc24  gtk+-2.6.6.tar.gz