From 5f668dfb5b335f5e2220925291cb9ee69d0b2ceb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Thu, 4 Aug 2005 13:49:11 +0000
Subject: [PATCH] 2.7.5

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

diff --git a/.cvsignore b/.cvsignore
index dd183c6..b8e2b63 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,4 @@ gtk+-2.7.1.tar.bz2
 gtk+-2.7.2.tar.bz2
 gtk+-2.7.3.tar.bz2
 gtk+-2.7.4.tar.bz2
+gtk+-2.7.5.tar.bz2
diff --git a/gtk2.spec b/gtk2.spec
index 6505d4a..4eab127 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -10,7 +10,11 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
+<<<<<<< gtk2.spec
+%define base_version 2.7.5
+=======
 %define base_version 2.7.4
+>>>>>>> 1.85
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
@@ -22,10 +26,8 @@ Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
 Source1: update-scripts.tar.gz
 
-# Rename the 'Default' widget theme to 'Raleigh'
-Patch1: gtk+-2.7.0-themename.patch
 # Biarch changes
-Patch2: gtk+-2.4.1-lib64.patch
+Patch0: gtk+-2.4.1-lib64.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -84,8 +86,7 @@ docs for the GTK+ widget toolkit.
 
 (cd .. && tar xzf %{SOURCE1})
 
-%patch1 -p1 -b .themename
-%patch2 -p1 -b .lib64
+%patch0 -p1 -b .lib64
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -254,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc tmpdocs/examples
 
 %changelog
+* Thu Aug  4 2005 Matthias Clasen <mclasen@redhat.com>
+- Newer upstream version
+
 * Thu Jul 28 2005 Owen Taylor <otaylor@redhat.com> 2.7.4-1
 - Update to 2.7.4
 
diff --git a/sources b/sources
index 0d95202..ed79a2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 cc70205392e209ae73eff74e020111f2  update-scripts.tar.gz
-1a121264a4ba2e208c025d9eb0515d41  gtk+-2.7.4.tar.bz2
+dbadc6e9272ed64fd321194089cc52cd  gtk+-2.7.5.tar.bz2