This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 08fa5002dba26ff75d0bfb47d795582f7d034b35 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Mar 5 11:28:05 2017 +0100 Simplify systemd usage a bit and make sure that it's restarted on Fedora and RHEL-based distros. FIXME: Not enabled by default on FC/RHEL/*SuSE. --- debian/changelog | 2 ++ x2goserver.spec | 13 +++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index a832257..0a422f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium shared-mime-info and desktop-file-utils as post/postun scriptlet dependencies and provides special macros since 11.4. Older versions are handled via the usual commands. + - Simplify systemd usage a bit and make sure that it's restarted on Fedora + and RHEL-based distros. FIXME: Not enabled by default on FC/RHEL/*SuSE. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index cdd4a4e..d7dfb0d 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -44,6 +44,9 @@ BuildRequires: man %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 BuildRequires: systemd +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd-rpm-macros +%endif %endif # for useradd/groupadd @@ -143,13 +146,7 @@ Requires: xorg-x11-xauth Requires: which %endif -%if 0%{?fedora} || 0%{?rhel} >= 7 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%endif - -%if 0%{?suse_version} && 0%{?suse_version} >= 1210 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %{?systemd_requires} %endif @@ -491,7 +488,7 @@ fi %systemd_preun x2goserver.service %postun -%systemd_postun x2goserver.service +%systemd_postun_with_restart x2goserver.service %else %service_del_preun x2goserver.service -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git