keeping sockets in /var/run and still trying to comply with http://lists.opensuse.org/opensuse-packaging/2014-04/msg00046.html

OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=161
This commit is contained in:
Fridrich Strba 2014-05-15 12:17:40 +00:00 committed by Git OBS Bridge
parent f8fbf1ce52
commit 7fdf7b7d87
5 changed files with 12 additions and 12 deletions

View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Thu May 15 11:06:07 UTC 2014 - fstrba@suse.com
- Move default home back from /run/dbus to /var/run/dbus
- Move system socket back from /run/dbus to /var/run/dbus
* From upstream reasoning:
Some specifications we want to stay compatibility actually

View File

@ -137,8 +137,8 @@ export V=1
--enable-systemd \
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-system-pid-file=/var/run/dbus/pid \
--with-console-auth-dir=/run/dbus/at_console/ \
--with-system-pid-file=/run/dbus/pid \
--with-system-socket=/var/run/dbus/system_bus_socket \
--with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
@ -160,7 +160,7 @@ mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
install -d %{buildroot}/var/run/dbus
install -d %{buildroot}/run/dbus
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
install -m 0644 %SOURCE2 \
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
@ -192,7 +192,7 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%pre -n dbus-1
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
%preun -n dbus-1
%{stop_on_removal dbus}
@ -251,7 +251,7 @@ fi
# See doc/system-activation.txt in source tarball for the rationale
# behind these permissions
%attr(4750,root,messagebus) %verify(not mode) /lib/dbus-1/dbus-daemon-launch-helper
%ghost /var/run/dbus
%ghost /run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%if ! %{with_systemd}
%dir /usr/lib/systemd

View File

@ -83,7 +83,7 @@ mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
install -d %{buildroot}/var/run/dbus
install -d %{buildroot}/run/dbus
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
install -m 0644 %SOURCE2 \
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
@ -115,7 +115,7 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%pre -n dbus-1
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
%preun -n dbus-1
%{stop_on_removal dbus}
@ -174,7 +174,7 @@ fi
# See doc/system-activation.txt in source tarball for the rationale
# behind these permissions
%attr(4750,root,messagebus) %verify(not mode) /lib/dbus-1/dbus-daemon-launch-helper
%ghost /var/run/dbus
%ghost /run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%if ! %{with_systemd}
%dir /usr/lib/systemd

View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Thu May 15 11:06:07 UTC 2014 - fstrba@suse.com
- Move default home back from /run/dbus to /var/run/dbus
- Move system socket back from /run/dbus to /var/run/dbus
* From upstream reasoning:
Some specifications we want to stay compatibility actually

View File

@ -128,8 +128,8 @@ export V=1
--enable-systemd \
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
--with-system-pid-file=/var/run/dbus/pid \
--with-console-auth-dir=/run/dbus/at_console/ \
--with-system-pid-file=/run/dbus/pid \
--with-system-socket=/var/run/dbus/system_bus_socket \
--with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}