Use systemd user unit macros

This commit is contained in:
David King 2016-10-11 20:11:01 +02:00
parent ebb587f8e1
commit 18c422a071

View File

@ -48,9 +48,7 @@ BuildRequires: /usr/bin/xsltproc
BuildRequires: xmlto BuildRequires: xmlto
#For macroized scriptlets. #For macroized scriptlets.
Requires(post): systemd %{?systemd_requires}
Requires(preun): systemd
Requires(postun): systemd
BuildRequires: systemd BuildRequires: systemd
Requires: libselinux%{?_isa} >= %{libselinux_version} Requires: libselinux%{?_isa} >= %{libselinux_version}
@ -248,15 +246,21 @@ popd
/usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \ /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \
-s /sbin/nologin -r -d '/' dbus 2> /dev/null || : -s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
%post
%systemd_post dbus.service dbus.socket
%systemd_user_post dbus.service dbus.socket
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
%preun %preun
%systemd_preun stop dbus.service dbus.socket %systemd_preun dbus.service dbus.socket
%systemd_user_preun dbus.service dbus.socket
%postun libs -p /sbin/ldconfig
%postun %postun
%systemd_postun %systemd_postun dbus.service dbus.socket
%systemd_user_postun dbus.service dbus.socket
%postun libs -p /sbin/ldconfig
%files %files
@ -348,6 +352,7 @@ popd
%changelog %changelog
* Tue Oct 11 2016 David King <amigadave@amigadave.com> - 1:1.11.6-1 * Tue Oct 11 2016 David King <amigadave@amigadave.com> - 1:1.11.6-1
- Update to 1.11.6 - Update to 1.11.6
- Use systemd user unit macros
* Tue Aug 16 2016 David King <amigadave@amigadave.com> - 1:1.11.4-1 * Tue Aug 16 2016 David King <amigadave@amigadave.com> - 1:1.11.4-1
- Update to 1.11.4 - Update to 1.11.4