Accepting request 140686 from Base:System

Upower uses a systemd-sleep script to get informed when systemd has finished the resume. However this script is using /usr/bin/dbus-send instead of /bin/dbus-send. After a short discussion with DimStar, we agreed that it would be better to fix it in the dbus-1 package (by creating a symlink), so that it easily can be adjusted once the dbus-1 package is migrated to /usr (forwarded request 140663 from tittiatcoke)

OBS-URL: https://build.opensuse.org/request/show/140686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=94
This commit is contained in:
Stephan Kulow 2012-11-12 10:31:44 +00:00 committed by Git OBS Bridge
commit bc33f070ec
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 8 15:38:22 UTC 2012 - tittiatcoke@gmail.com
- Link /usr/bin/dbus-send to /bin/dbus-send. Upower uses
dbus-send to receive signals from systemd regarding resuming,
however looks for the moment in the wrong directory.
-------------------------------------------------------------------
Sat Nov 3 16:33:15 UTC 2012 - crrodriguez@opensuse.org

View File

@ -208,6 +208,11 @@ install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr
# Currently required to make upower work together with systemd
mkdir -p %{buildroot}/usr/bin
ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%pre
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -o -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || :
@ -245,6 +250,7 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
/bin/dbus-daemon
/bin/dbus-monitor
/bin/dbus-send
/usr/bin/dbus-send
/bin/dbus-uuidgen
%{_mandir}/man1/dbus-cleanup-sockets.1.*
%{_mandir}/man1/dbus-daemon.1.*