[X2Go-Commits] [x2goserver] 01/01: Remove macro call %systemd_pre for Fedora/EPEL-7 builds. No such macro in Fedora/RHEL7. (Fixes: 698).

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit ee0d261c8b24aed1de7fb275e657cdfda99eb0d5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 13 01:24:36 2014 +0100

    Remove macro call %systemd_pre for Fedora/EPEL-7 builds. No such macro in Fedora/RHEL7. (Fixes: 698).
    
    Conflicts:
    	x2goserver.spec
---
 debian/changelog |    2 ++
 x2goserver.spec  |    4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5dcda6..f831cf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -232,6 +232,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     + Add to BR: findutils.
     + For Fedora-like systems, don't make x2goserver bin:package authoritative
       for non-X2Go directories. (Fixes: #676).
+    + Remove macro call %systemd_pre for Fedora/EPEL-7 builds. No such macro in
+      Fedora/RHEL7. (Fixes: 698).
 
   [ Matthew L. Dailey ]
   * New upstream version (4.0.1.19):
diff --git a/x2goserver.spec b/x2goserver.spec
index 8410fa5..5e33a97 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -459,7 +459,6 @@ getent passwd x2gouser >/dev/null || \
     -c "x2go" x2gouser
 exit 0
 
-
 %post
 # Initialize the session database
 if [ ! -s %{_localstatedir}/lib/x2go/x2go_sessions ]; then
@@ -480,9 +479,6 @@ fi
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %systemd_post x2goserver.service
 
-%pre
-%systemd_pre x2goserver.service
-
 %preun
 %systemd_preun x2goserver.service
 

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