[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
git-admin at x2go.org
Sat Dec 13 01:26:06 CET 2014
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 a3abbf5c94c2c815d4064c4fdde65d59c02c35d5
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).
---
debian/changelog | 2 ++
x2goserver.spec | 6 +-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d8161d7..4d34828 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,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 0e29991..1911406 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -339,13 +339,9 @@ 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
+%if 0%{?suse_version} >= 1210
%service_add_pre x2goserver.service
%endif
-%endif
%post
# Initialize the session database
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list