From 337387ac7b444afa1c267479be25536387bd3392 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 30 Aug 2018 10:03:25 +0000 Subject: [PATCH 01/15] dbus: move systemd-hooks for dbus.socket to 'dbus-common' The systemd_{post,postun,preun,..} hooks should be called in the package that actually provides the given files. There is no harm in calling these in the dbus-daemon package, but preferably we don't. Move this to 'dbus-common' for dbus.socket, since dbus.socket is provided by it. This makes sure the unit is properly enabled/disabled even without the dbus-daemon package installed. Note that it is safe to enable/disable dbus.socket even without a dbus.service around. systemd can deal with this just fine, and only ever actually pulls in the socket if an activatable service is around. Signed-off-by: David Herrmann --- dbus.spec | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dbus.spec b/dbus.spec index 132b1f1..2c77982 100644 --- a/dbus.spec +++ b/dbus.spec @@ -310,19 +310,31 @@ popd /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \ -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : +%post common +%systemd_post dbus.socket +%systemd_user_post dbus.socket + %post daemon -%systemd_post dbus-daemon.service dbus.socket -%systemd_user_post dbus-daemon.service dbus.socket +%systemd_post dbus-daemon.service +%systemd_user_post dbus-daemon.service %post libs -p /sbin/ldconfig +%preun common +%systemd_preun dbus.socket +%systemd_user_preun dbus.socket + %preun daemon -%systemd_preun dbus-daemon.service dbus.socket -%systemd_user_preun dbus-daemon.service dbus.socket +%systemd_preun dbus-daemon.service +%systemd_user_preun dbus-daemon.service + +%postun common +%systemd_postun dbus.socket +%systemd_user_postun dbus.socket %postun daemon -%systemd_postun dbus-daemon.service dbus.socket -%systemd_user_postun dbus-daemon.service dbus.socket +%systemd_postun dbus-daemon.service +%systemd_user_postun dbus-daemon.service %postun libs -p /sbin/ldconfig From 79fe35567b32a4bad073c8040307fea784300bb8 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Fri, 31 Aug 2018 14:37:38 +0000 Subject: [PATCH 02/15] 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. From 83c01b25d9470bcd6fb6fd842a5b529c7039d858 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 31 Aug 2018 14:38:09 +0000 Subject: [PATCH 03/15] dbus: apply presets on update The systemd RPM macros only apply presets on first install, we need to also apply them on the initial upgrade that starts depending on them. Signed-off-by: Tom Gundersen Signed-off-by: David Herrmann --- dbus.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dbus.spec b/dbus.spec index abf92aa..1828ad7 100644 --- a/dbus.spec +++ b/dbus.spec @@ -22,7 +22,7 @@ Name: dbus Epoch: 1 Version: 1.12.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -338,6 +338,13 @@ popd %postun libs -p /sbin/ldconfig +%triggerpostun common -- dbus-common < 1:1.12.10-4 +systemctl --no-reload preset dbus.socket &>/dev/null || : +systemctl --no-reload --global preset dbus.socket &>/dev/null || : + +%triggerpostun daemon -- dbus-daemon < 1:1.12.10-4 +systemctl --no-reload preset dbus-daemon.service &>/dev/null || : +systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %files # The 'dbus' package is only retained for compatibility purposes. It will @@ -444,6 +451,10 @@ popd %changelog +* Fri Aug 31 2018 Tom Gundersen - 1:1.12.10-3 +- Make sure presets are applied when upgrading from packages before the presets + existed + * 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. From 7e0514876892951687fba63040f4630cea182545 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 31 Aug 2018 14:41:27 +0000 Subject: [PATCH 04/15] dbus: depend on the right fedora-release for f29 Signed-off-by: Tom Gundersen Signed-off-by: David Herrmann --- dbus.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbus.spec b/dbus.spec index 1828ad7..f420c69 100644 --- a/dbus.spec +++ b/dbus.spec @@ -5,8 +5,8 @@ %global libselinux_version 2.0.86 -# fedora-release-30-0.2 added required presets to enable systemd-unit symlinks -%global fedora_release_version 30-0.2 +# fedora-release-29-0.12 added required presets to enable systemd-unit symlinks +%global fedora_release_version 29-0.12 %global dbus_user_uid 81 From 8f3ff4dd6cd307d3c1075e2df7c024aa27e18cbc Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 19 Oct 2018 07:53:14 +0100 Subject: [PATCH 05/15] Move user and group creation to daemon subpackage --- dbus.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dbus.spec b/dbus.spec index f420c69..2339af3 100644 --- a/dbus.spec +++ b/dbus.spec @@ -22,7 +22,7 @@ Name: dbus Epoch: 1 Version: 1.12.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -304,7 +304,7 @@ popd %endif -%pre common +%pre daemon # Add the "dbus" user and group /usr/sbin/groupadd -r -g %{dbus_user_uid} dbus 2>/dev/null || : /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \ @@ -451,6 +451,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog +* Fri Oct 19 2018 David King - 1:1.12.10-4 +- Move user and group creation to daemon subpackage + * Fri Aug 31 2018 Tom Gundersen - 1:1.12.10-3 - Make sure presets are applied when upgrading from packages before the presets existed From 7e5ac9fffdbdda6fbb11a10b4e35483ad03156c8 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 19 Oct 2018 07:54:56 +0100 Subject: [PATCH 06/15] Move systemd to Requires of common subpackage (#1638910) --- dbus.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dbus.spec b/dbus.spec index 2339af3..20844ab 100644 --- a/dbus.spec +++ b/dbus.spec @@ -61,7 +61,6 @@ BuildRequires: cmake %endif #For macroized scriptlets. -%{?systemd_requires} BuildRequires: systemd # Note: These is only required for --with-tests; when bootstrapping, you can @@ -87,6 +86,7 @@ Summary: D-BUS message bus configuration Group: System Environment/Libraries BuildArch: noarch Requires(pre): /usr/sbin/useradd +%{?systemd_requires} Requires: fedora-release >= %{fedora_release_version} %description common @@ -453,6 +453,7 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog * Fri Oct 19 2018 David King - 1:1.12.10-4 - Move user and group creation to daemon subpackage +- Move systemd to Requires of common subpackage (#1638910) * Fri Aug 31 2018 Tom Gundersen - 1:1.12.10-3 - Make sure presets are applied when upgrading from packages before the presets From e5920b7c914ee5bdc5bb1c2c525e793df1b22333 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 19 Oct 2018 09:12:19 +0100 Subject: [PATCH 07/15] Remove unnecessary ldconfig calls https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets --- dbus.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dbus.spec b/dbus.spec index 20844ab..4b6c202 100644 --- a/dbus.spec +++ b/dbus.spec @@ -318,8 +318,6 @@ popd %systemd_post dbus-daemon.service %systemd_user_post dbus-daemon.service -%post libs -p /sbin/ldconfig - %preun common %systemd_preun dbus.socket %systemd_user_preun dbus.socket @@ -336,8 +334,6 @@ popd %systemd_postun dbus-daemon.service %systemd_user_postun dbus-daemon.service -%postun libs -p /sbin/ldconfig - %triggerpostun common -- dbus-common < 1:1.12.10-4 systemctl --no-reload preset dbus.socket &>/dev/null || : systemctl --no-reload --global preset dbus.socket &>/dev/null || : @@ -454,6 +450,7 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : * Fri Oct 19 2018 David King - 1:1.12.10-4 - Move user and group creation to daemon subpackage - Move systemd to Requires of common subpackage (#1638910) +- Remove unnecessary ldconfig calls * Fri Aug 31 2018 Tom Gundersen - 1:1.12.10-3 - Make sure presets are applied when upgrading from packages before the presets From 7fba6aba69d3d910acdad0af05ea4748ac44e3e8 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 23 Oct 2018 13:48:52 +0000 Subject: [PATCH 08/15] Move 'useradd' dependency to daemon subpackage The 'useradd' invocation is now on the 'daemon' subpackage, so move the useradd dependency as well. Signed-off-by: David Herrmann --- dbus.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dbus.spec b/dbus.spec index 4b6c202..8a8bc2a 100644 --- a/dbus.spec +++ b/dbus.spec @@ -22,7 +22,7 @@ Name: dbus Epoch: 1 Version: 1.12.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -85,7 +85,6 @@ per-user-login-session messaging facility. Summary: D-BUS message bus configuration Group: System Environment/Libraries BuildArch: noarch -Requires(pre): /usr/sbin/useradd %{?systemd_requires} Requires: fedora-release >= %{fedora_release_version} @@ -100,6 +99,7 @@ Requires: libselinux%{?_isa} >= %{libselinux_version} Requires: dbus-common = %{epoch}:%{version}-%{release} Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: dbus-tools = %{epoch}:%{version}-%{release} +Requires(pre): /usr/sbin/useradd %description daemon D-BUS is a system for sending messages between applications. It is @@ -447,6 +447,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog +* Tue Oct 23 2018 David Herrmann - 1:1.12.10-5 +- Move useradd dependency to daemon subpackage + * Fri Oct 19 2018 David King - 1:1.12.10-4 - Move user and group creation to daemon subpackage - Move systemd to Requires of common subpackage (#1638910) From fe19cfc6e35847dfa9ad8c95565b7d23e22e70c2 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 5 Nov 2018 14:46:51 +0100 Subject: [PATCH 09/15] Add missing requires to 'common' and 'daemon' subpackage Both subpackages call various %systemd scriptlets, so they need the %systmd_requires macro. Their %triggerpostun also call systemctl directly, so add an explicit Requires on that. Some of this may in practice prove redundant, but let's be explicit and hopefully more robust. Signed-off-by: Tom Gundersen --- dbus.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbus.spec b/dbus.spec index 8a8bc2a..f446d52 100644 --- a/dbus.spec +++ b/dbus.spec @@ -87,6 +87,7 @@ Group: System Environment/Libraries BuildArch: noarch %{?systemd_requires} Requires: fedora-release >= %{fedora_release_version} +Requires: /usr/bin/systemctl %description common The %{name}-common package provides the configuration and setup files for D-Bus @@ -95,11 +96,13 @@ implementations to provide a System and User Message Bus. %package daemon Summary: D-BUS message bus Group: System Environment/Libraries +%{?systemd_requires} Requires: libselinux%{?_isa} >= %{libselinux_version} Requires: dbus-common = %{epoch}:%{version}-%{release} Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: dbus-tools = %{epoch}:%{version}-%{release} Requires(pre): /usr/sbin/useradd +Requires: /usr/bin/systemctl %description daemon D-BUS is a system for sending messages between applications. It is From d39121006b7ef45a4a4bce6a4715299e58d84f9a Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 5 Nov 2018 15:13:18 +0000 Subject: [PATCH 10/15] Add further Requires to subpackages Add fedora-release to daemon subpackage, as the systemctl preset calls in the triggerpostun require it. Add systemd_requires macro to daemon subpackage, as it (like the common subpackage) calls systemctl in triggerpostun. --- dbus.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dbus.spec b/dbus.spec index f446d52..7582a12 100644 --- a/dbus.spec +++ b/dbus.spec @@ -22,7 +22,7 @@ Name: dbus Epoch: 1 Version: 1.12.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -97,6 +97,7 @@ implementations to provide a System and User Message Bus. Summary: D-BUS message bus Group: System Environment/Libraries %{?systemd_requires} +Requires: fedora-release >= %{fedora_release_version} Requires: libselinux%{?_isa} >= %{libselinux_version} Requires: dbus-common = %{epoch}:%{version}-%{release} Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -450,6 +451,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog +* Mon Nov 05 2018 David King - 1:1.12.10-6 +- Add further Requires to subpackages + * Tue Oct 23 2018 David Herrmann - 1:1.12.10-5 - Move useradd dependency to daemon subpackage From b9e195f6bf3bb31b2f0541d7bccb84b708fee1e0 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 6 Nov 2018 17:43:55 +0100 Subject: [PATCH 11/15] Fix messagebus alias --- dbus-daemon.service | 4 +++- dbus.spec | 13 +++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dbus-daemon.service b/dbus-daemon.service index c63456e..171d4c4 100644 --- a/dbus-daemon.service +++ b/dbus-daemon.service @@ -9,5 +9,7 @@ ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=o OOMScoreAdjust=-900 [Install] -Alias=dbus.service +# Make sure that services can still refer to this under the name of the +# old SysV script (messagebus). +Alias=dbus.service messagebus.service WantedBy=multi-user.target diff --git a/dbus.spec b/dbus.spec index 7582a12..b7d0071 100644 --- a/dbus.spec +++ b/dbus.spec @@ -22,7 +22,7 @@ Name: dbus Epoch: 1 Version: 1.12.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -228,11 +228,6 @@ install -Dp -m644 %{SOURCE3} %{buildroot}%{_unitdir}/dbus-daemon.service install -Dp -m644 %{SOURCE4} %{buildroot}%{_userunitdir}/dbus.socket install -Dp -m644 %{SOURCE5} %{buildroot}%{_userunitdir}/dbus-daemon.service -# Make sure that when somebody asks for D-Bus under the name of the -# old SysV script, that he ends up with the standard dbus.service name -# now. -ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service - # Obsolete, but still widely used, for drop-in configuration snippets. install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d install --directory %{buildroot}%{_sysconfdir}/dbus-1/system.d @@ -342,7 +337,7 @@ popd systemctl --no-reload preset dbus.socket &>/dev/null || : systemctl --no-reload --global preset dbus.socket &>/dev/null || : -%triggerpostun daemon -- dbus-daemon < 1:1.12.10-4 +%triggerpostun daemon -- dbus-daemon < 1:1.12.10-7 systemctl --no-reload preset dbus-daemon.service &>/dev/null || : systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : @@ -368,7 +363,6 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %{_datadir}/dbus-1/interfaces %{_sysusersdir}/dbus.conf %{_unitdir}/dbus.socket -%{_unitdir}/messagebus.service %{_userunitdir}/dbus.socket %files daemon @@ -451,6 +445,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog +* Tue Nov 06 2018 Tom Gundersen - 1:1.12.10-7 +- Fix the messagebus.service alias + * Mon Nov 05 2018 David King - 1:1.12.10-6 - Add further Requires to subpackages From e70dafcb6318579d720236f5dde749ed2c9448ee Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 21 Jan 2019 13:11:25 +0000 Subject: [PATCH 12/15] Fix requirement on fedora-release Similar to commit bca95f22ecbc3d64dc16eefafe711ed5165d427b on master. --- dbus.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dbus.spec b/dbus.spec index b7d0071..1b18d06 100644 --- a/dbus.spec +++ b/dbus.spec @@ -6,6 +6,7 @@ %global libselinux_version 2.0.86 # fedora-release-29-0.12 added required presets to enable systemd-unit symlinks +# generic-release does not yet have the required presets %global fedora_release_version 29-0.12 %global dbus_user_uid 81 @@ -22,7 +23,7 @@ Name: dbus Epoch: 1 Version: 1.12.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -86,7 +87,7 @@ Summary: D-BUS message bus configuration Group: System Environment/Libraries BuildArch: noarch %{?systemd_requires} -Requires: fedora-release >= %{fedora_release_version} +Conflicts: fedora-release < %{fedora_release_version} Requires: /usr/bin/systemctl %description common @@ -97,7 +98,7 @@ implementations to provide a System and User Message Bus. Summary: D-BUS message bus Group: System Environment/Libraries %{?systemd_requires} -Requires: fedora-release >= %{fedora_release_version} +Conflicts: fedora-release < %{fedora_release_version} Requires: libselinux%{?_isa} >= %{libselinux_version} Requires: dbus-common = %{epoch}:%{version}-%{release} Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -445,6 +446,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog +* Mon Jan 21 2019 David King - 1:1.12.10-8 +- Fix requirement on fedora-release + * Tue Nov 06 2018 Tom Gundersen - 1:1.12.10-7 - Fix the messagebus.service alias From 59e4e60b0bfe3c3402342ee44f8fb758cd2b293c Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 4 Dec 2018 21:38:38 +0000 Subject: [PATCH 13/15] Update to 1.12.12 --- .gitignore | 1 + dbus.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2c8c105..d066dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /dbus-1.12.0.tar.gz /dbus-1.12.8.tar.gz /dbus-1.12.10.tar.gz +/dbus-1.12.12.tar.gz diff --git a/dbus.spec b/dbus.spec index 1b18d06..68b2455 100644 --- a/dbus.spec +++ b/dbus.spec @@ -22,8 +22,8 @@ Name: dbus Epoch: 1 -Version: 1.12.10 -Release: 8%{?dist} +Version: 1.12.12 +Release: 1%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -371,7 +371,7 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : # just have it be in libs, because dbus Requires dbus-libs. %{!?_licensedir:%global license %%doc} %license COPYING -%doc AUTHORS ChangeLog HACKING NEWS README +%doc AUTHORS ChangeLog CONTRIBUTING.md NEWS README %exclude %{_pkgdocdir}/api %exclude %{_pkgdocdir}/dbus.devhelp %exclude %{_pkgdocdir}/diagram.* @@ -446,6 +446,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog +* Tue Dec 04 2018 David King - 1:1.12.12-1 +- Update to 1.12.12 + * Mon Jan 21 2019 David King - 1:1.12.10-8 - Fix requirement on fedora-release diff --git a/sources b/sources index 9e91808..8a3d2a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dbus-1.12.10.tar.gz) = 36a16393af6630c32474b971fb8864ded0fb5fe08c5ff5243a4ca312b95af4f20335c5f166b72526a0b8162c1ccfe6542ad6953c5d21a0542d920d7cb4a9ac76 +SHA512 (dbus-1.12.12.tar.gz) = 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f From 3003d5f603c408d7f6f75bc0f648f6f6a2da845b Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 14 Dec 2018 23:03:22 +0000 Subject: [PATCH 14/15] Change -devel subpackage to depend on -libs --- dbus.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dbus.spec b/dbus.spec index 68b2455..cb7f19e 100644 --- a/dbus.spec +++ b/dbus.spec @@ -140,8 +140,7 @@ other supporting documentation such as the introspect dtd file. %package devel Summary: Development files for D-BUS Group: Development/Libraries -# The server package can be a different architecture. -Requires: %{name}-daemon = %{epoch}:%{version}-%{release} +Requires: dbus-libs%{?_isa} = %{epoch}:%{version}-%{release} # For xml directory ownership. Requires: xml-common @@ -446,8 +445,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : %changelog -* Tue Dec 04 2018 David King - 1:1.12.12-1 +* Mon Jan 21 2019 David King - 1:1.12.12-1 - Update to 1.12.12 +- Change -devel subpackage to depend on -libs * Mon Jan 21 2019 David King - 1:1.12.10-8 - Fix requirement on fedora-release From 1542d96bcd802ced60c5547544244b6dbaf137ca Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 21 Jan 2019 13:30:41 +0000 Subject: [PATCH 15/15] Ensure presets are applied during this upgrade only --- dbus.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dbus.spec b/dbus.spec index cb7f19e..ccd2edf 100644 --- a/dbus.spec +++ b/dbus.spec @@ -333,11 +333,11 @@ popd %systemd_postun dbus-daemon.service %systemd_user_postun dbus-daemon.service -%triggerpostun common -- dbus-common < 1:1.12.10-4 +%triggerpostun common -- dbus-common < 1:1.12.12-1 systemctl --no-reload preset dbus.socket &>/dev/null || : systemctl --no-reload --global preset dbus.socket &>/dev/null || : -%triggerpostun daemon -- dbus-daemon < 1:1.12.10-7 +%triggerpostun daemon -- dbus-daemon < 1:1.12.12-1 systemctl --no-reload preset dbus-daemon.service &>/dev/null || : systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : @@ -448,6 +448,7 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || : * Mon Jan 21 2019 David King - 1:1.12.12-1 - Update to 1.12.12 - Change -devel subpackage to depend on -libs +- Ensure presets are applied during this upgrade only * Mon Jan 21 2019 David King - 1:1.12.10-8 - Fix requirement on fedora-release