Fix messagebus alias

This commit is contained in:
Tom Gundersen 2018-11-06 17:43:55 +01:00
parent cc2d235361
commit 4873c189a2
2 changed files with 8 additions and 9 deletions

View File

@ -9,5 +9,7 @@ ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=o
OOMScoreAdjust=-900 OOMScoreAdjust=-900
[Install] [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 WantedBy=multi-user.target

View File

@ -22,7 +22,7 @@
Name: dbus Name: dbus
Epoch: 1 Epoch: 1
Version: 1.12.10 Version: 1.12.10
Release: 6%{?dist} Release: 7%{?dist}
Summary: D-BUS message bus Summary: D-BUS message bus
Group: System Environment/Libraries 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 %{SOURCE4} %{buildroot}%{_userunitdir}/dbus.socket
install -Dp -m644 %{SOURCE5} %{buildroot}%{_userunitdir}/dbus-daemon.service 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. # Obsolete, but still widely used, for drop-in configuration snippets.
install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d
install --directory %{buildroot}%{_sysconfdir}/dbus-1/system.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 preset dbus.socket &>/dev/null || :
systemctl --no-reload --global 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 preset dbus-daemon.service &>/dev/null || :
systemctl --no-reload --global 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 %{_datadir}/dbus-1/interfaces
%{_sysusersdir}/dbus.conf %{_sysusersdir}/dbus.conf
%{_unitdir}/dbus.socket %{_unitdir}/dbus.socket
%{_unitdir}/messagebus.service
%{_userunitdir}/dbus.socket %{_userunitdir}/dbus.socket
%files daemon %files daemon
@ -451,6 +445,9 @@ systemctl --no-reload --global preset dbus-daemon.service &>/dev/null || :
%changelog %changelog
* Tue Nov 06 2018 Tom Gundersen <teg@jklm.no> - 1:1.12.10-7
- Fix the messagebus.service alias
* Mon Nov 05 2018 David King <amigadave@amigadave.com> - 1:1.12.10-6 * Mon Nov 05 2018 David King <amigadave@amigadave.com> - 1:1.12.10-6
- Add further Requires to subpackages - Add further Requires to subpackages