[gnome-packagekit] Add %{?_isa} to PackageKit Requires to avoid arch-independent deps on
Michael Schwendt
mschwendt at fedoraproject.org
Wed Dec 11 10:45:11 UTC 2013
commit 5bd819bd0d054d97464f8b0b9b612999101a1b12
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Wed Dec 11 11:45:10 2013 +0100
Add %{?_isa} to PackageKit Requires to avoid arch-independent deps on
PackageKit causing multiarch conflicts (#972571)
- Add %{?_isa} to explicit dep on PackageKit-libs dbus-x11 libcanberra
gnome-packagekit.spec | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/gnome-packagekit.spec b/gnome-packagekit.spec
index 7a1778b..446f64a 100644
--- a/gnome-packagekit.spec
+++ b/gnome-packagekit.spec
@@ -1,20 +1,22 @@
Summary: Session applications to manage packages
Name: gnome-packagekit
Version: 3.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://www.packagekit.org
Source0: http://download.gnome.org/sources/gnome-packagekit/3.11/%{name}-%{version}.tar.xz
Requires: gnome-icon-theme
-Requires: dbus-x11 >= 1.1.2
-Requires: PackageKit >= 0.5.0
-Requires: PackageKit-libs >= 0.5.0
+Requires: dbus-x11%{?_isa} >= 1.1.2
+Requires: PackageKit%{?_isa} >= 0.5.0
+Requires: PackageKit-libs%{?_isa} >= 0.5.0
+# virtual Provides in "PackageKit" (checked on 20131211)
Requires: PackageKit-device-rebind >= 0.5.0
Requires: shared-mime-info
Requires: iso-codes
-Requires: libcanberra >= 0.10
+# at 0.10 since 2008 (Fedora 10)
+Requires: libcanberra%{?_isa} >= 0.10
# required because KPackageKit provides exactly the same interface
Provides: PackageKit-session-service
@@ -156,6 +158,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/man/man1/gpk-update-viewer.1.gz
%changelog
+* Wed Dec 11 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.11.1-2
+- Add %%{?_isa} to PackageKit Requires to avoid arch-independent deps on
+ PackageKit causing multiarch conflicts (#972571)
+- Add %%{?_isa} to explicit dep on PackageKit-libs dbus-x11 libcanberra
+
* Tue Nov 05 2013 Richard Hughes <rhughes at redhat.com> - 3.11.1-1
- Update to 3.11.1
More information about the scm-commits
mailing list