From: Sean Reifschneider <jafo@tummy.com>
Date: Wed, 5 Jan 2005 04:59:29 +0000 (+0000)
Subject: Merging the current development changes for the idle wrapper.
X-Git-Tag: v2.3.5c1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15f51d746404c9fb510ff39131ad1ec756439cd9;p=thirdparty%2FPython%2Fcpython.git

Merging the current development changes for the idle wrapper.
---

diff --git a/Misc/RPM/python-2.3.spec b/Misc/RPM/python-2.3.spec
index 0fa8e9d0056c..93a121de8a3c 100644
--- a/Misc/RPM/python-2.3.spec
+++ b/Misc/RPM/python-2.3.spec
@@ -35,7 +35,7 @@
 %define name python
 %define version 2.3.4
 %define libvers 2.3
-%define release 3pydotorg
+%define release 4pydotorg
 %define __prefix /usr
 
 #  kludge to get around rpm <percent>define weirdness
@@ -131,6 +131,9 @@ formats.
 %endif
 
 %changelog
+* Tue Jan 04 2005 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.4-4pydotorg]
+- Changing the idle wrapper so that it passes arguments to idle.
+
 * Thu Jul 22 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.4-3pydotorg]
 - Paul Tiemann fixes for %{prefix}.
 - Adding permission changes for directory as suggested by reimeika.ca
@@ -254,8 +257,11 @@ fi
 
 ########
 #  Tools
-echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
-echo 'exec %{__prefix}/bin/python%{binsuffix} %{__prefix}/%{libdirname}/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{__prefix}/bin/idle%{binsuffix}
+echo '#!%{__prefix}/bin/env python%{binsuffix}' >${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
+echo 'import os, sys' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
+echo 'os.execvp("%{__prefix}/bin/python%{binsuffix}", ["%{__prefix}/bin/python%{binsuffix}", "%{__prefix}/lib/python%{libvers}/idlelib/idle.py"] + sys.argv[1:])' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
+echo 'print "Failed to exec Idle"' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
+echo 'sys.exit(1)' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
 chmod 755 $RPM_BUILD_ROOT%{__prefix}/bin/idle%{binsuffix}
 cp -a Tools $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}