[PackageKit/f14/master] - Include a backported patch from master as the F14 buildroot has an old version of GTK3 that is d

[Richard Hughes]

commit 1165de3a03f6754a5605166ce8974f94fae95d12
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Oct 5 13:52:01 2010 +0100

    - Include a backported patch from master as the F14 buildroot has an
      old version of GTK3 that is different API to the rawhide version.

 PackageKit-0.6.10-fix-gtk3-build.patch |   19 +++++++++++++++++++
 PackageKit.spec                        |   11 ++++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/PackageKit-0.6.10-fix-gtk3-build.patch b/PackageKit-0.6.10-fix-gtk3-build.patch
new file mode 100644
index 0000000..ebf2178
--- /dev/null
+++ b/PackageKit-0.6.10-fix-gtk3-build.patch
@@ -0,0 +1,19 @@
+commit 67c101b9ba24e1a476a180023a3575911ee0c977
+Author: Richard Hughes <richard at hughsie.com>
+Date:   Tue Oct 5 13:13:51 2010 +0100
+
+    Require GTK >= 2.91.0 for the GTK3 version of the PackageKit font install module
+
+diff --git a/configure.ac b/configure.ac
+index 04bc175..33ee702 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -440,7 +440,7 @@ AC_ARG_ENABLE(gtk_module, AS_HELP_STRING([--enable-gtk-module],[Build GTK module
+ if test x$enable_gtk_module = xyes; then
+ 	PKG_CHECK_MODULES(PK_GTK_MODULE_GTK2, gtk+-2.0 >= 2.14.0 pangoft2 fontconfig dbus-glib-1,
+ 	                  build_gtk_module_gtk2=yes, build_gtk_module_gtk2=no)
+-	PKG_CHECK_MODULES(PK_GTK_MODULE_GTK3, gtk+-3.0 pangoft2 fontconfig dbus-glib-1,
++	PKG_CHECK_MODULES(PK_GTK_MODULE_GTK3, gtk+-3.0 >= 2.91.0 pangoft2 fontconfig dbus-glib-1,
+ 	                  build_gtk_module_gtk3=yes, build_gtk_module_gtk3=no)
+ 	# if either are true, visit the gtk-module directory
+ 	if test $build_gtk_module_gtk2 = "yes" -o $build_gtk_module_gtk3 = "yes"; then
diff --git a/PackageKit.spec b/PackageKit.spec
index 66526b6..c796116 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -5,7 +5,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.6.9
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
@@ -16,6 +16,9 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 # Fedora specific: the yum backend doesn't do time estimation correctly
 Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 
+# Already upstream: don't build with old versions of gtk3
+Patch2:    PackageKit-0.6.10-fix-gtk3-build.patch
+
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
@@ -227,8 +230,10 @@ user to restart the computer or remove and re-insert the device.
 %setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
+%patch2 -p1 -b .no-old-gtk3
 
 %build
+autoconf
 %configure \
         --disable-static \
         --enable-yum \
@@ -425,6 +430,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Oct 04 2010 Richard Hughes  <rhughes at redhat.com> - 0.6.9-4
+- Include a backported patch from master as the F14 buildroot has an
+  old version of GTK3 that is different API to the rawhide version.
+
 * Mon Oct 04 2010 Richard Hughes  <rhughes at redhat.com> - 0.6.9-3
 - Delete the subpackage PackageKit-gtk3-module as GLib in F14 does
   not contain GApplication.