[dbus/f21] Tighten subpackage dependencies by using %{?_isa}

David King amigadave at fedoraproject.org
Wed Dec 17 09:04:43 UTC 2014


commit 4fcc8c26d5815755c30677f9ec484434f4a7e6f2
Author: David King <amigadave at amigadave.com>
Date:   Wed Dec 3 15:35:40 2014 +0000

    Tighten subpackage dependencies by using %{?_isa}
    
    Additionally, make the -x11 subpackage depend on xorg-x11-xinit.

 dbus.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/dbus.spec b/dbus.spec
index c7bb259..a6939a0 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -84,7 +84,7 @@ other supporting documentation such as the introspect dtd file.
 %package devel
 Summary: Development files for D-BUS
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains libraries and header files needed for
@@ -93,12 +93,14 @@ developing software that uses D-BUS.
 %package x11
 Summary: X11-requiring add-ons for D-BUS
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: xorg-x11-xinit
 
 %description x11
 D-BUS contains some tools that require Xlib to be installed, those are
 in this separate package so server systems need not install X.
 
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -247,11 +249,13 @@ ln -s %{_pkgdocdir} %{buildroot}%{_datadir}/gtk-doc/html/dbus
 %{_libdir}/pkgconfig/dbus-1.pc
 %{_includedir}/*
 
+
 %changelog
 * Fri Dec 05 2014 David King <amigadave at amigadave.com> - 1:1.8.12-2
 - Correct license description for multiple licenses
 - Use macroized systemd scriptlets (#850083)
 - Add some more documentation from the upstream tarball
+- Tighten subpackage dependencies by using %%{?_isa}
 
 * Wed Nov 26 2014 David King <amigadave at amigadave.com> - 1:1.8.12-1
 - Update to 1.8.12 (#1168438)


More information about the scm-commits mailing list