This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 7cc24af Correctly quote the tests against $DISTRIB_RELEASE in x2goruncommand that were badly quoted (which caused them to report the wrong result and to create a file called "=" in the user home directory). Aligning all tests to use the same style of quoting fixes this. (Fixes: #409). new 67f62fb x2goserver.spec: Let builds for EPEL-7 behave like recent Fedora builds. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goserver.spec | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 67f62fb866f67204a85faaecdb3d098d1cecdedd Author: Mike Gabriel <mike.gabriel@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 409fd46..78cd598 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,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 81b98c2..f994b6e 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 @@ -286,7 +286,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} @@ -317,7 +317,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 @@ -401,7 +401,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
-
git-admin＠x2go.org