From 27eb7993d28676714164cba69657713f16ea468a Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 30 Aug 2018 11:47:16 +0200 Subject: [PATCH] dbus: change 'system-release' dependency to 'fedora-release' As it turns out, 'fedora-release' only has: 'Provides: system-release' rather than: 'Provides: system-release = %{version}-%{release}' This means, any explicit dependencies on 'system-release' ignore versioning completely. This is unfortunate, and breaks our reliance on 'system-release'. Fortunately, unlike recommended on the wiki, it is safe to depend on 'fedora-release' explicitly. Other fedora flavors have this package as well, so there is no reason not to. Signed-off-by: David Herrmann --- dbus.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dbus.spec b/dbus.spec index 2c77982..abf92aa 100644 --- a/dbus.spec +++ b/dbus.spec @@ -6,7 +6,7 @@ %global libselinux_version 2.0.86 # fedora-release-30-0.2 added required presets to enable systemd-unit symlinks -%global system_release_version 30-0.2 +%global fedora_release_version 30-0.2 %global dbus_user_uid 81 @@ -87,7 +87,7 @@ Summary: D-BUS message bus configuration Group: System Environment/Libraries BuildArch: noarch Requires(pre): /usr/sbin/useradd -Requires: system-release >= %{system_release_version} +Requires: fedora-release >= %{fedora_release_version} %description common The %{name}-common package provides the configuration and setup files for D-Bus @@ -444,6 +444,10 @@ popd %changelog +* Thu Aug 30 2018 David Herrmann - 1:1.12.10-2 +- Change 'system-release' dependency to 'fedora-release', since otherwise hard + version dependencies are ignored. + * Fri Aug 10 2018 David Herrmann - 1:1.12.10-2 - Move generic units into 'dbus-common', so other dbus implementations can use them as well.