Tighten subpackage dependencies by using %{?_isa}
Additionally, make the -x11 subpackage depend on xorg-x11-xinit.
This commit is contained in:
parent
ceb3d56240
commit
cc5bc1dd69
@ -81,7 +81,7 @@ other supporting documentation such as the introspect dtd file.
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for D-BUS
|
Summary: Development files for D-BUS
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package contains libraries and header files needed for
|
This package contains libraries and header files needed for
|
||||||
@ -90,15 +90,18 @@ developing software that uses D-BUS.
|
|||||||
%package x11
|
%package x11
|
||||||
Summary: X11-requiring add-ons for D-BUS
|
Summary: X11-requiring add-ons for D-BUS
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: xorg-x11-xinit
|
||||||
|
|
||||||
%description x11
|
%description x11
|
||||||
D-BUS contains some tools that require Xlib to be installed, those are
|
D-BUS contains some tools that require Xlib to be installed, those are
|
||||||
in this separate package so server systems need not install X.
|
in this separate package so server systems need not install X.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Avoid rpath.
|
# Avoid rpath.
|
||||||
if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf --verbose --force --install; fi
|
if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf --verbose --force --install; fi
|
||||||
@ -223,12 +226,14 @@ ln -s %{_pkgdocdir} %{buildroot}%{_datadir}/gtk-doc/html/dbus
|
|||||||
%{_libdir}/pkgconfig/dbus-1.pc
|
%{_libdir}/pkgconfig/dbus-1.pc
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Dec 03 2014 David King <amigadave@amigadave.com> - 1:1.8.12-2
|
* Wed Dec 03 2014 David King <amigadave@amigadave.com> - 1:1.8.12-2
|
||||||
- Drop bindir patch, and update to comply with UsrMove
|
- Drop bindir patch, and update to comply with UsrMove
|
||||||
- Correct license description for multiple licenses
|
- Correct license description for multiple licenses
|
||||||
- Use macroized systemd scriptlets (#850083)
|
- Use macroized systemd scriptlets (#850083)
|
||||||
- Add some more documentation from the upstream tarball
|
- Add some more documentation from the upstream tarball
|
||||||
|
- Tighten subpackage dependencies by using %%{?_isa}
|
||||||
|
|
||||||
* Wed Nov 26 2014 David King <amigadave@amigadave.com> - 1:1.8.12-1
|
* Wed Nov 26 2014 David King <amigadave@amigadave.com> - 1:1.8.12-1
|
||||||
- Update to 1.8.12 (#1168438)
|
- Update to 1.8.12 (#1168438)
|
||||||
|
Loading…
Reference in New Issue
Block a user