Update to 2.99.0

.gitignore

@@ -5,3 +5,4 @@ gtk+-2.90.5.tar.bz2
 /gtk+-2.91.3.tar.bz2
 /gtk+-2.91.4.tar.bz2
 /gtk+-2.91.5.tar.bz2
+/gtk+-2.99.0.tar.bz2

gtk3.spec

@@ -10,17 +10,15 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
-Version: 2.91.5
+Version: 2.99.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 #VCS: git:git://git.gnome.org/gtk+
-Source: http://download.gnome.org/sources/gtk+/2.91/gtk+-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gtk+/2.99/gtk+-%{version}.tar.bz2
 Source3: im-cedilla.conf
 
-Patch0: system-python.patch
-
 BuildRequires: gnome-common autoconf automake intltool gettext
 
 Patch2: 0001-New-tooltip-style.patch
@@ -109,8 +107,7 @@ widget toolkit.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch0 -p1 -b .system-python
-%patch2 -p1 -b .fresh-tooltips
+#%patch2 -p1 -b .fresh-tooltips
 
 %build
 
@@ -158,6 +155,7 @@ touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/engines
 
 %post
 /sbin/ldconfig
@@ -187,9 +185,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gtk-query-immodules-3.0*
-%{_bindir}/gtk-update-icon-cache-3.0
-%{_libdir}/libgtk-x11-3.0.so.*
-%{_libdir}/libgdk-x11-3.0.so.*
+%exclude %{_bindir}/gtk-update-icon-cache
+%{_libdir}/libgtk-3.0.so.*
+%{_libdir}/libgdk-3.0.so.*
 %{_libdir}/libgailutil-3.0.so.*
 %dir %{_libdir}/gtk-3.0
 %dir %{_libdir}/gtk-3.0/%{bin_version}
@@ -205,7 +203,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %dir %{_sysconfdir}/gtk-3.0
 %ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
 %{_mandir}/man1/gtk-query-immodules-3.0.1.gz
-%{_mandir}/man1/gtk-update-icon-cache-3.0.1.gz
+%exclude %{_mandir}/man1/gtk-update-icon-cache.1.gz
 %{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 
 %files immodules
@@ -230,10 +228,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %files devel -f gtk30-properties.lang
 %defattr(-, root, root, -)
 %{_libdir}/lib*.so
-%{_libdir}/gtk-3.0/include
 %{_includedir}/*
 %{_datadir}/aclocal/*
-%{_bindir}/gtk-builder-convert-3.0
+%exclude %{_bindir}/gtk-builder-convert
 %{_libdir}/pkgconfig/*
 %{_bindir}/gtk3-demo
 %{_datadir}/gtk-3.0
@@ -242,9 +239,15 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %files devel-docs
 %defattr(-, root, root, -)
 %{_datadir}/gtk-doc
-%{_mandir}/man1/gtk-builder-convert-3.0.1.gz
+%exclude %{_mandir}/man1/gtk-builder-convert.1.gz
 
 %changelog
+* Thu Jan  6 2011 Matthias Clasen <mclasen@redhat.com> 2.99.0-1
+- Update to 2.99.0
+- Drop gtk-update-icon-cache and gtk-builder-convert to
+  avoid conflict with gtk2
+- Drop the tooltips-style patch for now
+
 * Thu Dec  2 2010 Matthias Clasen <mclasen@redhat.com> 2.91.5-1
 - Update to 2.91.5
 

sources

@@ -1 +1 @@
-c4c59e3d63ffb391388ade991c03a3f2  gtk+-2.91.5.tar.bz2
+8991403e30457362f1bf20f1313a6456  gtk+-2.99.0.tar.bz2

system-python.patch

@@ -1,9 +0,0 @@
-diff -up gtk+-2.18.2/gtk/gtk-builder-convert.system-python gtk+-2.18.2/gtk/gtk-builder-convert-3.0
---- gtk+-2.18.2/gtk/gtk-builder-convert-3.0.system-python	2009-10-13 15:59:50.423385098 -0400
-+++ gtk+-2.18.2/gtk/gtk-builder-convert-3.0	2009-10-13 16:00:31.876142050 -0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright (C) 2006-2008 Async Open Source
- #                         Henrique Romano <henrique@async.com.br>