Accepting request 544566 from home:simotek:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/544566
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=260
This commit is contained in:
Simon Lees 2017-11-23 10:04:56 +00:00 committed by Git OBS Bridge
parent 709b54b4f4
commit 78606b6921
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 23 10:04:03 UTC 2017 - sflees@suse.de
- Fix dbus-daemon-launch-helper to use proper ref to libexecdir
-------------------------------------------------------------------
Wed Nov 22 07:58:25 UTC 2017 - sflees@suse.de

View File

@ -207,7 +207,7 @@ ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-lau
find %{buildroot} -type f -name "*.la" -delete -print
%verifyscript -n dbus-1
%verify_permissions -e %{_libdir}/dbus-1/dbus-daemon-launch-helper
%verify_permissions -e %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
%post -n %{_libname} -p /sbin/ldconfig
%postun -n %{_libname} -p /sbin/ldconfig
@ -261,7 +261,7 @@ if [ ! -L %{_localstatedir}/lib/dbus/machine-id ]; then
fi
/sbin/ldconfig
%set_permissions %{_libdir}/dbus-1/dbus-daemon-launch-helper
%set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.nox11 10
%service_add_post dbus.service dbus.socket
%tmpfiles_create %_tmpfilesdir/dbus.conf
@ -325,7 +325,7 @@ fi
%{_sbindir}/rcdbus
# See doc/system-activation.txt in source tarball for the rationale
# behind these permissions
%attr(4750,root,messagebus) %verify(not mode) %{_libdir}/dbus-1/dbus-daemon-launch-helper
%attr(4750,root,messagebus) %verify(not mode) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%ghost %{_localstatedir}/run/dbus
%else