[X2Go-Commits] [x2gobroker] 01/01: For Fedora 22 and beyond explicitly call python2 in all shebangs.
git-admin at x2go.org
git-admin at x2go.org
Mon Dec 8 11:57:19 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 36821512a8f0c00f24d1eaa9773384cc747bbaa2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Dec 8 11:57:12 2014 +0100
For Fedora 22 and beyond explicitly call python2 in all shebangs.
---
debian/changelog | 1 +
x2gobroker.spec | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9b765eb..02ed4b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -256,6 +256,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
init scripts.
+ No adm group on non-Debian systems by default. Using root instead on RPM
based systems.
+ + For Fedora 22 and beyond explicitly call python2 in all shebangs.
[ Josh Lukens ]
* New upstream version (0.0.3.0):
diff --git a/x2gobroker.spec b/x2gobroker.spec
index df42a3b..4dda393 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -335,6 +335,11 @@ sed -i etc/broker/x2gobroker-sessionprofiles.conf \
-e 's/^name=MATE - localhost/name=GNOME - localhost/' \
-e 's/^command=MATE/command=GNOME/'
%endif
+%if 0%{?fedora} >= 22
+grep -l -r -E '^#!/usr/bin/env python$' | while read file; do \
+ sed -i "$file" \
+ -e 's/\/usr\/bin\/env python/\/usr\/bin\/env python2/'
+%endif
sed -i logrotate/x2gobroker-authservice \
-e 's/adm/root/'
sed -i logrotate/x2gobroker-daemon \
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list