[PackageKit] Absorb the hawkey backend into the main package
Richard Hughes
rhughes at fedoraproject.org
Thu Dec 19 13:01:42 UTC 2013
commit 1a2654707c49c2b253c8a50f96e26e6cbf7c6b84
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Dec 19 11:29:47 2013 +0000
Absorb the hawkey backend into the main package
PackageKit.spec | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/PackageKit.spec b/PackageKit.spec
index cd77b4e..c78d922 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -76,32 +76,30 @@ Obsoletes: udev-packagekit < %{version}-%{release}
# No more GTK+-2 plugin
Obsoletes: PackageKit-gtk-module < %{version}-%{release}
-# No more smart or yum in Fedora
+# No more zif, smart or yum in Fedora
Obsoletes: PackageKit-smart < %{version}-%{release}
-Obsoletes: PackageKit-yum < %{version}-%{release}
-Obsoletes: PackageKit-yum-plugin < %{version}-%{release}
+Obsoletes: PackageKit-yum < 0.8.15-2
+Obsoletes: PackageKit-yum-plugin < 0.8.15-2
+Obsoletes: PackageKit-zif < 0.8.13-2
+
+# hawkey backend is now built-in
+Obsoletes: PackageKit-hawkey < 0.8.15-2
# Udev no longer provides this functionality
-Provides: PackageKit-device-rebind = %{version}-%{release}
Obsoletes: PackageKit-device-rebind < 0.8.13-2
+# remove F22
+Provides: PackageKit-device-rebind = %{version}-%{release}
+Provides: PackageKit-hawkey = %{version}-%{release}
+Provides: PackageKit-yum = %{version}-%{release}
+Provides: PackageKit-yum-plugin = %{version}-%{release}
+Provides: PackageKit-zif = %{version}-%{release}
+
%description
PackageKit is a D-Bus abstraction layer that allows the session user
to manage packages in a secure way using a cross-distro,
cross-architecture API.
-%if 0%{?rhel} == 0
-%package hawkey
-Summary: PackageKit Hawkey backend
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Provides: PackageKit-backend
-Provides: PackageKit-zif = %{version}-%{release}
-Obsoletes: PackageKit-zif < 0.8.13-2
-
-%description hawkey
-A backend for PackageKit to enable Hawkey functionality.
-%endif
-
%package docs
Summary: Documentation for PackageKit
BuildArch: noarch
@@ -303,17 +301,14 @@ systemctl enable packagekit-offline-update.service &> /dev/null || :
/usr/lib/systemd/system/packagekit-offline-update.service
/usr/lib/systemd/system/packagekit.service
%{_libexecdir}/pk-*offline-update
+%if 0%{?rhel} == 0
+%{_libdir}/packagekit-backend/libpk_backend_hawkey.so
+%endif
%files docs
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/PackageKit
-%if 0%{?rhel} == 0
-%files hawkey
-%defattr(-,root,root,-)
-%{_libdir}/packagekit-backend/libpk_backend_hawkey.so
-%endif
-
%files glib
%defattr(-,root,root,-)
%{_libdir}/*packagekit-glib2.so.*
More information about the scm-commits
mailing list