From d72cecad8b437cee7c602b18569f768ec15e941281873c7d984423d9a9894261 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 7 Jan 2011 15:54:59 +0000
Subject: [PATCH] Accepting request 56649 from
 home:dimstar:branches:GNOME:Factory

thanks

OBS-URL: https://build.opensuse.org/request/show/56649
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=26
---
 gtk+-2.91.6.tar.bz2 |  3 ---
 gtk+-2.91.7.tar.bz2 |  3 +++
 gtk3.changes        | 29 +++++++++++++++++++++++++++++
 gtk3.spec           | 22 +++++++---------------
 4 files changed, 39 insertions(+), 18 deletions(-)
 delete mode 100644 gtk+-2.91.6.tar.bz2
 create mode 100644 gtk+-2.91.7.tar.bz2

diff --git a/gtk+-2.91.6.tar.bz2 b/gtk+-2.91.6.tar.bz2
deleted file mode 100644
index 62af8cb..0000000
--- a/gtk+-2.91.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57b0d8dc6e3d43967f19edb9f3706608260b6122a7d3eef66a28025400fa0af7
-size 16795155
diff --git a/gtk+-2.91.7.tar.bz2 b/gtk+-2.91.7.tar.bz2
new file mode 100644
index 0000000..805c5ab
--- /dev/null
+++ b/gtk+-2.91.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24fbfd9d7f45a57df80cbc7ac8185672f0cdc9f259dc3680b0d35401fc906860
+size 16923801
diff --git a/gtk3.changes b/gtk3.changes
index dcd37b9..61dbbc7 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Dec 22 21:14:11 CET 2010 - dimstar@opensuse.org
+
+- Update to version 2.91.7:
+  + The treeview-refactor branch has been merged, bringing more
+    flexible cell arrangement with GtkCellArea, GtkCellAreaBox, etc
+  + The gdk-backend branch has been merged. This branch cleans up
+    the internal frontend/backend separation in GDK, with the
+    ultimate goal of allowing to build a single gdk library that
+    contains multiple backends (interesting combinations are
+    x11+wayland or quartz+x11).
+  + A number of GTK+ widgets have been ported to use
+    GtkStyleContext directly for rendering
+  + The tracker search backend for the file chooser has been
+    updated to work with libtracker-sparql as available in
+    tracker >= 0.9
+  + The GtkAboutDialog has been given a facelift. It no longer
+    opens second-level dialogs
+  + The GDK X11 backend now uses XI2 (including multi-device
+    capabilities) by default. Use gdk_disable_multidevice() to
+    switch back to the XI1/Core implementation
+  + Bugs fixed: bgo#629923, bgo#634657, bgo#635401, bgo#636732,
+    bgo#636777, bgo#637018, bgo#637069, bgo#637155, bgo#637156,
+    bgo#637189, bgo#637243, bgo#637256, bgo#637464, bgo#637471,
+    bgo#637520, bgo#637606, bgo#637608
+  + Updated translations.
+- Remove -DGTK_COMPILATION in CFLAGS fixup; it's no longer needed.
+- Enable parallel build again.
+
 -------------------------------------------------------------------
 Sat Dec 11 23:58:35 CET 2010 - dimstar@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index fec7e61..641d8bd 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk3 (Version 2.91.6)
+# spec file for package gtk3 (Version 2.91.7)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands
@@ -22,10 +22,8 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        2.91.6
+Version:        2.91.7
 Release:        1
-# FIXME: 2.90.5 doesn't compile with parallel build (bgo#624304). Check if this is still true for later versions.
-# FIXME: Check if CFLAGS workaround in build section is still needed (bgo#637143)
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
 Url:            http://www.gtk.org/
@@ -278,16 +276,12 @@ cp -a %{S:1} .
 gnome-patch-translation-update
 
 %build
-# FIXME: Workaround for bgo#637143 -- Implicit declaration of functions.
-export CFLAGS="%{optflags} -DGTK_COMPILATION"
 %configure \
         --disable-static \
         --enable-man \
         --with-xinput=xfree \
         --enable-introspection
-# building of gobject-introspection seems to fail with -j 'n>1' (see bgo#624304)
-#%{__make} %{?_smp_mflags}
-%{__make} V=1
+%{__make} V=1 %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -430,8 +424,8 @@ fi
 %dir %{_libdir}/gtk-3.0/modules
 %{_libdir}/gtk-3.0/modules/libgail.so
 %{_libdir}/libgailutil-3.0.so.*
-%{_libdir}/libgdk-x11-3.0.so.*
-%{_libdir}/libgtk-x11-3.0.so.*
+%{_libdir}/libgdk-3.0.so.*
+%{_libdir}/libgtk-3.0.so.*
 %{_libdir}/girepository-1.0/Gdk-3.0.typelib
 %{_libdir}/girepository-1.0/GdkX11-3.0.typelib
 %{_libdir}/girepository-1.0/Gtk-3.0.typelib
@@ -501,17 +495,15 @@ fi
 %{_datadir}/gtk-3.0/demo/
 %{_includedir}/gail-3.0/
 %{_includedir}/gtk-3.0/
-%{_libdir}/gtk-3.0/include/
 %{_libdir}/gtk-3.0/modules/libferret.so
 %{_libdir}/pkgconfig/gail-3.0.pc
 %{_libdir}/pkgconfig/gdk-3.0.pc
-%{_libdir}/pkgconfig/gdk-x11-3.0.pc
 %{_libdir}/pkgconfig/gtk+-3.0.pc
 %{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc
 %{_libdir}/pkgconfig/gtk+-x11-3.0.pc
 %{_libdir}/libgailutil-3.0.so
-%{_libdir}/libgdk-x11-3.0.so
-%{_libdir}/libgtk-x11-3.0.so
+%{_libdir}/libgdk-3.0.so
+%{_libdir}/libgtk-3.0.so
 %{_sysconfdir}/rpm/macros.gtk3
 
 %changelog