[PackageKit/f14/master] - Fix compile when not using Zif

[Richard Hughes]

commit c7dad495ce29610b9b5b7f713b4186c9dabbcb4d
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 1 19:44:04 2010 +0000

    - Fix compile when not using Zif

 0001-yum-fix-compiling-when-not-using-Zif.patch |   34 +++++++++++++++++++++++
 PackageKit.spec                                 |    9 +++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/0001-yum-fix-compiling-when-not-using-Zif.patch b/0001-yum-fix-compiling-when-not-using-Zif.patch
new file mode 100644
index 0000000..13743af
--- /dev/null
+++ b/0001-yum-fix-compiling-when-not-using-Zif.patch
@@ -0,0 +1,34 @@
+From a6b0e5323f3539b5a95bcf65d385abc86efe45ea Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 1 Nov 2010 19:40:51 +0000
+Subject: [PATCH] yum: fix compiling when not using Zif
+
+---
+ backends/yum/pk-backend-yum.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
+index 4594e6c..da6450e 100644
+--- a/backends/yum/pk-backend-yum.c
++++ b/backends/yum/pk-backend-yum.c
+@@ -672,8 +672,6 @@ out:
+ 	return array;
+ }
+ 
+-#endif
+-
+ /**
+  * pk_backend_get_cat_for_id:
+  */
+@@ -785,6 +783,8 @@ out:
+ 	return array_retval;
+ }
+ 
++#endif
++
+ /**
+  * pk_backend_search_thread:
+  */
+-- 
+1.7.3.2
+
diff --git a/PackageKit.spec b/PackageKit.spec
index 000dc40..ad0ac29 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -5,7 +5,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.6.10
-Release:   1%{?dist}
+Release:   2%{?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: fix build when not using Zif
+Patch2:    0001-yum-fix-compiling-when-not-using-Zif.patch
+
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
@@ -227,6 +230,7 @@ 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 .fix-build
 
 %build
 autoconf
@@ -426,6 +430,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Nov 01 2010 Richard Hughes  <rhughes at redhat.com> - 0.6.10-2
+- Fix compile when not using Zif
+
 * Mon Nov 01 2010 Richard Hughes  <rhughes at redhat.com> - 0.6.10-1
 - New upstream release.
 - Many small bugfixes and performance increases.