From edfa7b647ed32833e127674b2b6a0c6f46b1e5ca4004ee1892ba9e54fc346598 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 2 Sep 2011 16:00:22 +0000
Subject: [PATCH] Accepting request 80641 from
 home:vuntz:branches:GNOME:Factory

Update to 2.24.6

OBS-URL: https://build.opensuse.org/request/show/80641
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=147
---
 gtk+-2.24.5.tar.bz2 |  3 ---
 gtk+-2.24.6.tar.bz2 |  3 +++
 gtk2.changes        | 18 ++++++++++++++++++
 gtk2.spec           |  8 ++++++--
 4 files changed, 27 insertions(+), 5 deletions(-)
 delete mode 100644 gtk+-2.24.5.tar.bz2
 create mode 100644 gtk+-2.24.6.tar.bz2

diff --git a/gtk+-2.24.5.tar.bz2 b/gtk+-2.24.5.tar.bz2
deleted file mode 100644
index 0f9679b..0000000
--- a/gtk+-2.24.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f355f26003b1b42b97e584bdc475189a423fdd052088ee4bbd7aa0f989815cc8
-size 18153880
diff --git a/gtk+-2.24.6.tar.bz2 b/gtk+-2.24.6.tar.bz2
new file mode 100644
index 0000000..3d9f3e6
--- /dev/null
+++ b/gtk+-2.24.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37
+size 18330995
diff --git a/gtk2.changes b/gtk2.changes
index 759a66e..094db79 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug 31 09:52:22 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 2.24.6:
+  + Filechooser updates:
+    - Remove the expander in Save mode
+    - Move the path bar up in Save mode
+    - Remember the last opened directory
+    - Start in recently-used mode when no folder is set
+    - Update recent-files when confirming in the file chooser
+  + Win32 build fixes
+  + OS X build fixes for Lion
+  + Bugs fixed: bgo#508601, bgo#599664, bgo#649588, bgo#652045,
+    bgo#653191, bgo#655074, bgo#655087, bgo#655122, bgo#655392.
+  + Updated translations.
+- Use a sed workaround in %prep to disable the build of a broken
+  source for a test (see bgo#658039).
+
 -------------------------------------------------------------------
 Wed Jul  6 16:17:41 CEST 2011 - vuntz@opensuse.org
 
diff --git a/gtk2.spec b/gtk2.spec
index b22e31f..e5bacbe 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -21,15 +21,16 @@
 
 Name:           gtk2
 %define _name gtk+
-Version:        2.24.5
+Version:        2.24.6
 Release:        1
+# FIXME: 2.24.6 has a broken tests/testtreeview.c, see bgo#658039. Remove workaround in %prep once this is fixed.
 # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 2)
 Url:            http://www.gtk.org/
 Group:          System/Libraries
-Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gtk+/2.24/%{_name}-%{version}.tar.bz2
 Source2:        README.SuSE
 Source3:        gtkrc
 Source4:        baselibs.conf
@@ -296,6 +297,9 @@ This package contains the development files for GTK+ 2.x.
 %lang_package
 %prep
 %setup -q -n %{_name}-%{version}
+# Hacky workaround against broken tarball; the test will fail when it can be removed (see bgo#658039)
+test "x`wc -l tests/testtreeview.c`" = "x38 tests/testtreeview.c"
+sed -i "s/\ttesttreeview\t//g" tests/Makefile.am
 # This breaks the build, so disabled for now (see bnc#690180)
 #translation-update-upstream
 #translation-update-upstream po-properties gtk20-properties