terminalmage pushed to salt (f22). "Force python2.6 on EL6 (..more)"

[notifications at fedoraproject.org]

>From 0ad9c5e2b2fa611ff2554c8bc83644321d4a549e Mon Sep 17 00:00:00 2001
From: Erik Johnson <erik at saltstack.com>
Date: Mon, 13 Apr 2015 15:39:32 -0500
Subject: Force python2.6 on EL6

Fixes https://github.com/saltstack/salt/issues/22003

diff --git a/salt.spec b/salt.spec
index 5f154cf..07ede7b 100644
--- a/salt.spec
+++ b/salt.spec
@@ -16,7 +16,7 @@
 
 Name: salt
 Version: 2014.7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
@@ -226,6 +226,13 @@ install -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/
 %endif
 
+# Force python2.6 on EPEL6
+# https://github.com/saltstack/salt/issues/22003
+%if 0%{?rhel} == 6
+sed -i 's#/usr/bin/python#/usr/bin/python2.6#g' %{buildroot}%{_bindir}/salt*
+sed -i 's#/usr/bin/python#/usr/bin/python2.6#g' %{buildroot}%{_initrddir}/salt*
+%endif
+
 install -p %{SOURCE10} .
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
 install -p -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/logrotate.d/salt
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/salt.git/commit/?h=f22&id=0ad9c5e2b2fa611ff2554c8bc83644321d4a549e