[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: Let builds for EPEL-7 behave like recent Fedora builds.

git-admin at x2go.org git-admin at x2go.org
Tue Jan 28 19:11:02 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 0732d96b1b6d2a39038847130e6f956960270b1e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 28 19:10:57 2014 +0100

    x2goserver.spec: Let builds for EPEL-7 behave like recent Fedora builds.
---
 debian/changelog |    2 ++
 x2goserver.spec  |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ae7c06..4246aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low
   * New upstream release (4.0.1.14):
     - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log.
       (Fixes: #415).
+  * x2goserver.spec:
+    - Let builds for EPEL-7 behave like recent Fedora builds.
 
   [ Harald Nordgard-Hansen ]
   * New upstream release (4.0.1.14):
diff --git a/x2goserver.spec b/x2goserver.spec
index 2529b92..e8c1eae 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -20,7 +20,7 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %endif
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?el7}
 BuildRequires:  man2html-core
 BuildRequires:  systemd
 %else
@@ -228,7 +228,7 @@ touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions
 # Printing spool dir
 mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?el7}
 # System.d session cleanup script
 mkdir -p %{buildroot}%{_unitdir}
 install -pm0644 %SOURCE1 %{buildroot}%{_unitdir}
@@ -259,7 +259,7 @@ exit 0
 [ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null &&
   %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || :
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?el7}
 %systemd_post x2goserver.service
 
 %preun
@@ -344,7 +344,7 @@ exit 0
 %{_datadir}/x2go/versions/VERSION.x2goserver
 %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/
 %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?el7}
 %{_unitdir}/x2goserver.service
 %else
 %if 0%{?el5}

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



More information about the x2go-commits mailing list