From a6e3e5366fbaec55258c79d0e6c3037626dc3d09 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 1 Feb 2011 21:48:41 -0500
Subject: [PATCH] 2.99.3

---
 .gitignore |  1 +
 gtk3.spec  | 29 ++++++++++++-----------------
 sources    |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8a78934..a15f17d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gtk+-2.90.5.tar.bz2
 /gtk+-2.99.0.tar.bz2
 /gtk+-2.99.1.tar.bz2
 /gtk+-2.99.2.tar.bz2
+/gtk+-2.99.3.tar.bz2
diff --git a/gtk3.spec b/gtk3.spec
index f7e2c3f..61d6f0f 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -10,27 +10,23 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
-Version: 2.99.2
-Release: 2%{?dist}
+Version: 2.99.3
+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.99/gtk+-%{version}.tar.bz2
-Source3: im-cedilla.conf
+Source1: im-cedilla.conf
 
 BuildRequires: gnome-common autoconf automake intltool gettext
-
-# Fixes crash of gnome-settings-daemon when plugging in USB media, among other things
-Patch0: fix-gtk-show-uri-crash.patch
-#Patch2: 0001-New-tooltip-style.patch
-
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: cairo-gobject-devel >= %{cairo_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gdk-pixbuf2-devel
+BuildRequires: gtk2-devel
 BuildRequires: libXi-devel
 BuildRequires: gettext
 BuildRequires: gtk-doc
@@ -73,8 +69,8 @@ Requires: gtk3 = %{version}-%{release}
 Requires: imsettings
 
 %description immodules
-The gtk3-immodules package contains standalone input methods that are shipped
-as part of GTK+ 3.
+The gtk3-immodules package contains standalone input methods that
+are shipped as part of GTK+ 3.
 
 %package immodule-xim
 Summary: XIM support for GTK+
@@ -114,8 +110,6 @@ widget toolkit.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch0 -p1 -b .gtk-show-uri-gdk-screen
-#%patch2 -p1 -b .fresh-tooltips
 
 %build
 
@@ -124,7 +118,8 @@ autoreconf -f
 
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
  %configure $CONFIGFLAGS \
-	--with-xinput \
+        --with-xinput \
+        --enable-gtk2-dependency \
 )
 
 # fight unused direct deps
@@ -150,7 +145,7 @@ make install DESTDIR=$RPM_BUILD_ROOT        \
 )
 
 # Input method frameworks want this
-install -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
 
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -192,7 +187,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gtk-query-immodules-3.0*
-%exclude %{_bindir}/gtk-update-icon-cache
 %{_libdir}/libgtk-3.0.so.*
 %{_libdir}/libgdk-3.0.so.*
 %{_libdir}/libgailutil-3.0.so.*
@@ -237,7 +231,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_datadir}/aclocal/*
-%exclude %{_bindir}/gtk-builder-convert
 %{_libdir}/pkgconfig/*
 %{_bindir}/gtk3-demo
 %{_datadir}/gtk-3.0
@@ -246,9 +239,11 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %files devel-docs
 %defattr(-, root, root, -)
 %{_datadir}/gtk-doc
-%exclude %{_mandir}/man1/gtk-builder-convert.1.gz
 
 %changelog
+* Tue Feb  1 2011 Matthias Clasen <mclasen@redhat.com> - 2.99.3-1
+- Update to 2.99.3
+
 * Mon Jan 24 2011 Dan Williams <dcbw@redhat.com> 2.99.2-2
 - Fix bug in gtk_show_uri() which caused crashes when plugging in USB drives
 
diff --git a/sources b/sources
index f111d3e..5ca615b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e727b2bc0d17182d41ddd90a83285b0e  gtk+-2.99.2.tar.bz2
+3464064d36a212b1c051eff59af7a7e9  gtk+-2.99.3.tar.bz2