[PackageKit/f21] Always build the Hif backend as it's the only one available now

[Richard Hughes]

commit 2734981bc523063c7c211d9078d1fbe3773f73ef
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Dec 11 19:45:05 2014 +0000

    Always build the Hif backend as it's the only one available now

 PackageKit.spec |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/PackageKit.spec b/PackageKit.spec
index f8efe27..b1a84e9 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -7,13 +7,15 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   1.0.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
 Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
 
+%if 0%{?fedora}
 # generated using contrib/generate-md-archive.sh in the PackageKit source tree
 Source1:   cached-metadata.tar
+%endif
 
 # Fedora-specific: set Vendor.conf up for Fedora.
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
@@ -100,6 +102,7 @@ Provides: PackageKit-libs = %{version}-%{release}
 %description glib
 GLib libraries for accessing PackageKit.
 
+%if 0%{?fedora}
 %package cached-metadata
 Summary: Cached metadata for PackageKit
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -108,6 +111,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Cached metadata allows application installers to start instantly on the
 LiveCD or installed system without downloading files from the internet or
 regenerating the SAT caches. It can safely removed if not required.
+%endif
 
 %package cron
 Summary: Cron job and related utilities for PackageKit
@@ -176,9 +180,9 @@ using PackageKit.
 %build
 %configure \
         --disable-static \
-%if 0%{?rhel} == 0
         --enable-hif \
         --enable-introspection \
+%if 0%{?rhel} == 0
         --enable-bash-completion \
 %else
         --disable-bash-completion \
@@ -213,9 +217,11 @@ pushd ${RPM_BUILD_ROOT}%{_datadir}/PackageKit > /dev/null
 ln -s ../pixmaps/comps icons
 popd > /dev/null
 
+%if 0%{?fedora}
 # ship cached metadata on the LiveCD
 # http://blogs.gnome.org/hughsie/2014/08/29/putting-packagekit-metadata-on-the-fedora-livecd/
 tar -xf %{SOURCE1} --directory=$RPM_BUILD_ROOT
+%endif
 
 %find_lang %name
 
@@ -267,13 +273,13 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_unitdir}/packagekit.service
 %{_unitdir}/system-update.target.wants/
 %{_libexecdir}/pk-*offline-update
-%if 0%{?rhel} == 0
 %{_libdir}/packagekit-backend/libpk_backend_hif.so
-%endif
 
+%if 0%{?fedora}
 %files cached-metadata
 %{_datadir}/PackageKit/hawkey/
 %{_datadir}/PackageKit/metadata/
+%endif
 
 %files glib
 %{_libdir}/*packagekit-glib2.so.*
@@ -310,9 +316,13 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/gtk-doc/html/PackageKit
 
 %changelog
-* Mon Nov 17 2014 Kalev Lember <kalevlember at gmail.com> - 1.0.3-2
+* Mon Nov 17 2014 Kalev Lember <kalevlember at gmail.com> - 1.0.3-3
 - Update cached metadata in preparation for F21 release
 
+* Thu Nov 13 2014 Richard Hughes <rhughes at redhat.com> - 1.0.3-2
+- Always build the Hif backend as it's the only one available now.
+- Do not use Fedora cached-metadata for non-Fedora builds.
+
 * Mon Nov 10 2014 Richard Hughes <rhughes at redhat.com> - 1.0.3-1
 - New upstream release
 - Add support for reinstallation and downgrades