Accepting request 293250 from Base:System
Sync with SLE12 changes (conditionalized) OBS-URL: https://build.opensuse.org/request/show/293250 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=129
This commit is contained in:
commit
48476d6895
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 26 11:04:22 UTC 2015 - fstrba@suse.com
|
||||
|
||||
- Sync changes from SLE12 conditionalized for suse_version <= 1315
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 9 19:37:23 UTC 2015 - fstrba@suse.com
|
||||
|
||||
|
@ -134,9 +134,15 @@ export V=1
|
||||
--enable-systemd \
|
||||
%endif
|
||||
--enable-libaudit \
|
||||
%if 0%{?suse_version} <= 1315
|
||||
--with-console-auth-dir=/var/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/var/run/dbus/pid \
|
||||
--with-system-socket=/var/run/dbus/system_bus_socket \
|
||||
%else
|
||||
--with-console-auth-dir=/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/run/dbus/pid \
|
||||
--with-system-socket=/run/dbus/system_bus_socket \
|
||||
%endif
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -156,7 +162,11 @@ mkdir -p %{buildroot}%{_prefix}/sbin
|
||||
mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
|
||||
mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
|
||||
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus
|
||||
%if 0%{?suse_version} <= 1315
|
||||
install -d %{buildroot}/var/run/dbus
|
||||
%else
|
||||
install -d %{buildroot}/run/dbus
|
||||
%endif
|
||||
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
|
||||
install -m 0644 %{SOURCE2} \
|
||||
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
|
||||
@ -188,7 +198,11 @@ ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
|
||||
|
||||
%pre -n dbus-1
|
||||
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
|
||||
%if 0%{?suse_version} <= 1315
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || :
|
||||
%else
|
||||
%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
|
||||
%endif
|
||||
|
||||
%post -n dbus-1
|
||||
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then
|
||||
@ -239,7 +253,11 @@ 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
|
||||
%if 0%{?suse_version} <= 1315
|
||||
%ghost /var/run/dbus
|
||||
%else
|
||||
%ghost /run/dbus
|
||||
%endif
|
||||
%ghost %{_localstatedir}/lib/dbus/machine-id
|
||||
%if ! %{with_systemd}
|
||||
%dir %{_libexecdir}/systemd
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 26 11:04:22 UTC 2015 - fstrba@suse.com
|
||||
|
||||
- Sync changes from SLE12 conditionalized for suse_version <= 1315
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 9 19:37:23 UTC 2015 - fstrba@suse.com
|
||||
|
||||
|
@ -122,9 +122,15 @@ export V=1
|
||||
--enable-systemd \
|
||||
%endif
|
||||
--enable-libaudit \
|
||||
%if 0%{?suse_version} <= 1315
|
||||
--with-console-auth-dir=/var/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/var/run/dbus/pid \
|
||||
--with-system-socket=/var/run/dbus/system_bus_socket \
|
||||
%else
|
||||
--with-console-auth-dir=/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/run/dbus/pid \
|
||||
--with-system-socket=/run/dbus/system_bus_socket \
|
||||
%endif
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user