From 90f3a9ac534ce212fdb808d0c97462ebbdcbfd00 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Dec 17 2013 17:20:48 +0000
Subject: Replace the PackageKit dependency in PackageKit-backend-devel


  with a dep on PackageKit-glib-devel (which it needs for its
  packagekit-plugin.pc file) to stop the multiarch composer from
  pulling in conflicting PackgeKit packages. (#972571)
- Add %{?_isa} to dbus-devel and sqlite-devel deps.
- Fix group tag for -docs subpackage.
- Drop base package dep in -docs subpackage.

---

diff --git a/PackageKit.spec b/PackageKit.spec
index 9870db9..4235a52 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -6,7 +6,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.8.14
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -115,8 +115,7 @@ A backend for PackageKit to enable Hawkey functionality.
 
 %package docs
 Summary: Documentation for PackageKit
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Group: Documentation
 BuildArch: noarch
 
 %description docs
@@ -168,8 +167,8 @@ Provides facility to install debugging packages using PackageKit.
 Summary: GLib Libraries and headers for PackageKit
 Group: Development/Libraries
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
-Requires: dbus-devel >= 1.1.1
-Requires: sqlite-devel
+Requires: dbus-devel%{?_isa} >= 1.1.1
+Requires: sqlite-devel%{?_isa}
 Obsoletes: PackageKit-devel < %{version}-%{release}
 Provides: PackageKit-devel = %{version}-%{release}
 
@@ -179,7 +178,9 @@ GLib headers and libraries for PackageKit.
 %package backend-devel
 Summary: Headers to compile out of tree PackageKit backends
 Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+# explicit dep: packagekit-plugin.pc links with -lpackagekit-glib2
+# but doesn't refer to packagekit-glib2.pc
+Requires: %{name}-glib-devel%{?_isa} = %{version}-%{release}
 
 %description backend-devel
 Headers to compile out of tree PackageKit backends.
@@ -415,6 +416,15 @@ systemctl enable packagekit-offline-update.service &> /dev/null || :
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
+* Thu Dec 12 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 0.8.14-4
+- Replace the PackageKit dependency in PackageKit-backend-devel
+  with a dep on PackageKit-glib-devel (which it needs for its
+  packagekit-plugin.pc file) to stop the multiarch composer from
+  pulling in conflicting PackgeKit packages. (#972571)
+- Add %%{?_isa} to dbus-devel and sqlite-devel deps.
+- Fix group tag for -docs subpackage.
+- Drop base package dep in -docs subpackage.
+
 * Sat Dec 07 2013 Rex Dieter <rdieter@fedoraproject.org> 0.8.14-3
 - PackageKit many broadcasts messages (#781807)