[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-292-g65810d3
X2Go dev team
git-admin at x2go.org
Tue Dec 10 11:19:33 CET 2013
The branch, master has been updated
via 65810d372ee7e5cb0fc4dda0382b65ebf1305b27 (commit)
from ece1bd3958528273990da47e909d8ff534e9a45b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 65810d372ee7e5cb0fc4dda0382b65ebf1305b27
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Dec 10 11:18:47 2013 +0100
Use deprected %{_initrddir} macro for EPEL-5 builds.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver.spec | 5 +++++
2 files changed, 6 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8d74e91..f762f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,7 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
+ Handle X2Go session DB creation in x2goserver _and_
perl-X2Go-Server-DB on postinst.
+ Set buildroot if we build for EPEL-5.
+ + Use deprected %{_initrddir} macro for EPEL-5 builds.
[ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
* New upstream version (4.1.0.0):
diff --git a/x2goserver.spec b/x2goserver.spec
index 30bae5f..4559181 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -284,9 +284,14 @@ mkdir -p %{buildroot}%{_unitdir}
install -pm0644 %SOURCE1 %{buildroot}%{_unitdir}
%else
# SysV session cleanup script
+%if 0%{el5}
+mkdir -p %{buildroot}%{_initrddir}
+install -pm0755 %SOURCE2 %{buildroot}%{_initrddir}/x2goserver
+%else
mkdir -p %{buildroot}%{_initddir}
install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver
%endif
+%endif
%pre common
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list