[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: fix build of 4.0.1.x release series (1)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch build-testmain
in repository x2goserver.

commit 30be06023e419422ee7e51410e9c5f468f829772
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 28 14:57:18 2014 +0100

    x2goserver.spec: fix build of 4.0.1.x release series (1)
---
 x2goserver.spec |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/x2goserver.spec b/x2goserver.spec
index 45c1103..2f52361 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -338,6 +338,14 @@ getent passwd x2gouser >/dev/null || \
     -c "x2go" x2gouser
 exit 0
 
+%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%systemd_pre x2goserver.service
+%else
+%pre
+%service_add_pre x2goserver.service
+%endif
+
 
 %post
 # Initialize the session database
@@ -359,9 +367,6 @@ fi
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %systemd_post x2goserver.service
 
-%pre
-%systemd_pre x2goserver.service
-
 %preun
 %systemd_preun x2goserver.service
 
@@ -370,9 +375,6 @@ fi
 %else
 %service_add_post x2goserver.service
 
-%pre
-%service_add_pre x2goserver.service
-
 %preun
 %service_del_preun x2goserver.service
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git