Fridrich Strba 2015-09-16 15:29:00 +00:00 committed by Git OBS Bridge
parent 143e7be506
commit 1a602a32d5
3 changed files with 8 additions and 8 deletions

View File

@ -126,7 +126,7 @@ export V=1
%endif
--enable-systemd \
--enable-libaudit \
%if 0%{?suse_version} <= 1315 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
--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 \
@ -154,7 +154,7 @@ 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 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
install -d %{buildroot}/var/run/dbus
%else
install -d %{buildroot}/run/dbus
@ -190,7 +190,7 @@ 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 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%{_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 || :
@ -245,7 +245,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
%if 0%{?suse_version} <= 1315 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%ghost /var/run/dbus
%else
%ghost /run/dbus

View File

@ -83,7 +83,7 @@ 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 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
install -d %{buildroot}/var/run/dbus
%else
install -d %{buildroot}/run/dbus
@ -119,7 +119,7 @@ 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 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%{_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 || :
@ -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
%if 0%{?suse_version} <= 1315 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%ghost /var/run/dbus
%else
%ghost /run/dbus

View File

@ -116,7 +116,7 @@ export V=1
%endif
--enable-systemd \
--enable-libaudit \
%if 0%{?suse_version} <= 1315 && !0%{is_opensuse}
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
--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 \