[X2Go-Commits] [x2goserver] 09/10: Simplify systemd usage a bit and make sure that it's restarted on Fedora and RHEL-based distros.
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 6 09:47:53 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 463d650718bd9957e5bdf00cf1249316ccd3f1ee
Author: Mihai Moldovan <ionic at 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.
Cherry-picked from release/4.0.1.x branch.
---
debian/changelog | 2 ++
x2goserver.spec | 13 +++++--------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 709ed53..09ab567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -262,6 +262,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 c870d6e..3ddfa7a 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
# So XSESSIONDIR gets linked
@@ -121,13 +124,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
@@ -623,7 +620,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
More information about the x2go-commits
mailing list