From 54d78c71c94b3761637b31570372843b69ec058a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 3 Oct 2005 20:06:47 +0000
Subject: [PATCH] 2.8.5

---
 .cvsignore |  1 +
 gtk2.spec  | 10 +++++-----
 sources    |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 20ff4b3..a5b7888 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -20,3 +20,4 @@ gtk+-2.7.5.tar.bz2
 gtk+-2.8.0.tar.bz2
 gtk+-2.8.3.tar.bz2
 gtk+-2.8.4.tar.bz2
+gtk+-2.8.5.tar.bz2
diff --git a/gtk2.spec b/gtk2.spec
index c237889..f360ce9 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.8.4
+%define base_version 2.8.5
 %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,8 +24,6 @@ Source1: update-scripts.tar.gz
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
-# fixed in 2.8.5
-Patch1: gtk+-2.8.4-size-overflow.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -85,7 +83,6 @@ docs for the GTK+ widget toolkit.
 (cd .. && tar xzf %{SOURCE1})
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .size-overflow
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -254,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc tmpdocs/examples
 
 %changelog
+* Mon Oct  3 2005 Matthias Clasen <mclasen@redhat.com> 2.8.5-1
+- New upstream version
+
 * Fri Sep 30 2005 Matthias Clasen <mclasen@redhat.com> 2.8.4-2
 - Prevent an overflow in size hints handling
 
diff --git a/sources b/sources
index f893f94..34670bf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 cc70205392e209ae73eff74e020111f2  update-scripts.tar.gz
-ae14972d22ac338d87c56b6075dfd2a4  gtk+-2.8.4.tar.bz2
+cc25d162c5924e9bae02fb04c6fd494d  gtk+-2.8.5.tar.bz2