rpms/dbus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix requirement on system-release

Browse Source 
The addition of `Requires: fedora-release` broke all installations
using the non-branded `generic-release` package. This should not be
a requirement, but a conflict against versions older than those
which added the preset.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2018-11-07 10:24:56 -05:00
parent 4873c189a2
commit bca95f22ec
No known key found for this signature in database
GPG Key ID: 7A25556236BAA3A3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dbus.spec
View File

@ -5,8 +5,9 @@
%global libselinux_version 2.0.86 %global libselinux_version 2.0.86
# fedora-release-30-0.2 added required presets to enable systemd-unit symlinks # fedora-release-30-0.2 and generic-release-0.1 added required presets to enable systemd-unit symlinks
%global fedora_release_version 30-0.2 %global fedora_release_version 30-0.2
%global generic_release_version 30-0.1
%global dbus_user_uid 81 %global dbus_user_uid 81
@ -22,7 +23,7 @@
Name: dbus Name: dbus
Epoch: 1 Epoch: 1
Version: 1.12.10 Version: 1.12.10
Release: 7%{?dist} Release: 8%{?dist}
Summary: D-BUS message bus Summary: D-BUS message bus
Group: System Environment/Libraries Group: System Environment/Libraries
@ -86,7 +87,8 @@ Summary: D-BUS message bus configuration
Group: System Environment/Libraries Group: System Environment/Libraries
BuildArch: noarch BuildArch: noarch
%{?systemd_requires} %{?systemd_requires}
Requires: fedora-release >= %{fedora_release_version} Conflicts: fedora-release < %{fedora_release_version}
Conflicts: generic-release < %{generic_release_version}
Requires: /usr/bin/systemctl Requires: /usr/bin/systemctl
%description common %description common
@ -97,7 +99,8 @@ implementations to provide a System and User Message Bus.
Summary: D-BUS message bus Summary: D-BUS message bus
Group: System Environment/Libraries Group: System Environment/Libraries
%{?systemd_requires} %{?systemd_requires}
Requires: fedora-release >= %{fedora_release_version} Conflicts: fedora-release < %{fedora_release_version}
Conflicts: generic-release < %{generic_release_version}
Requires: libselinux%{?_isa} >= %{libselinux_version} Requires: libselinux%{?_isa} >= %{libselinux_version}
Requires: dbus-common = %{epoch}:%{version}-%{release} Requires: dbus-common = %{epoch}:%{version}-%{release}
Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release}
@ -445,6 +448,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || :
%changelog %changelog
* Wed Nov 07 2018 Stephen Gallagher <sgallagh@redhat.com> - 1:1.12.10-8
- Fix requirement on system-release
* Tue Nov 06 2018 Tom Gundersen <teg@jklm.no> - 1:1.12.10-7 * Tue Nov 06 2018 Tom Gundersen <teg@jklm.no> - 1:1.12.10-7
- Fix the messagebus.service alias - Fix the messagebus.service alias