packages: python/python-ac_fixes.patch, python/python-lib64.patch, python/p...
arekm
arekm at pld-linux.org
Mon Jul 5 20:41:45 CEST 2010
Author: arekm Date: Mon Jul 5 18:41:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- update to 2.7 (builds but fails on files; still some small fixes and testing is needed)
---- Files affected:
packages/python:
python-ac_fixes.patch (1.5 -> 1.6) , python-lib64.patch (1.18 -> 1.19) , python-noarch_to_datadir.patch (1.10 -> 1.11) , python-pythonpath.patch (1.4 -> 1.5) , python.spec (1.359 -> 1.360) , python-db.patch (1.6 -> NONE) (REMOVED), python-no_ndbm.patch (1.6 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/python/python-ac_fixes.patch
diff -u packages/python/python-ac_fixes.patch:1.5 packages/python/python-ac_fixes.patch:1.6
--- packages/python/python-ac_fixes.patch:1.5 Tue Feb 26 22:40:15 2008
+++ packages/python/python-ac_fixes.patch Mon Jul 5 20:41:39 2010
@@ -5,7 +5,7 @@
if test "$Py_DEBUG" = 'true' ; then
# Optimization messes up debuggers, so turn it off for
# debug builds.
-- OPT="-g -Wall $STRICT_PROTO"
+- OPT="-g -O0 -Wall $STRICT_PROTO"
+ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
else
- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
@@ -18,15 +18,15 @@
;;
esac
case $ac_sys_system in
-diff -Nur Python-2.5.2.orig/Makefile.pre.in Python-2.5.2/Makefile.pre.in
---- Python-2.5.2.orig/Makefile.pre.in 2007-12-05 20:43:57.000000000 +0000
-+++ Python-2.5.2/Makefile.pre.in 2008-02-26 09:41:02.000000000 +0000
-@@ -861,7 +861,7 @@
- $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+--- Python-2.7/Makefile.pre.in~ 2010-04-12 02:10:46.000000000 +0200
++++ Python-2.7/Makefile.pre.in 2010-07-05 20:04:00.942224202 +0200
+@@ -953,7 +953,7 @@
+ python-config: $(srcdir)/Misc/python-config.in
# Substitution happens here, as the completely-expanded BINDIR
# is not available in configure
- sed -e "s, at EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
+ sed -e "s, at EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
- $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
- rm python-config
- @if [ -s Modules/python.exp -a \
+
+ # Install the include files
+ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
+
================================================================
Index: packages/python/python-lib64.patch
diff -u packages/python/python-lib64.patch:1.18 packages/python/python-lib64.patch:1.19
--- packages/python/python-lib64.patch:1.18 Fri Oct 3 10:13:47 2008
+++ packages/python/python-lib64.patch Mon Jul 5 20:41:39 2010
@@ -126,28 +126,27 @@
diff -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
--- Python-2.5b2.orig/Lib/site.py 2006-06-12 09:23:02.000000000 +0100
+++ Python-2.5b2/Lib/site.py 2006-07-12 17:42:51.000000000 +0100
-@@ -265,13 +265,20 @@
+@@ -265,12 +265,19 @@
if sys.platform in ('os2emx', 'riscos'):
- sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
+ sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
-- sitedirs.append(os.path.join(prefix, "lib",
-+ sitedirs.append(os.path.join(prefix, sys.lib,
+- sitepackages.append(os.path.join(prefix, "lib",
++ sitepackages.append(os.path.join(prefix, sys.lib,
"python" + sys.version[:3],
"site-packages"))
-- sitedirs.append(os.path.join(prefix, "lib", "site-python"))
-+ sitedirs.append(os.path.join(prefix, sys.lib, "site-python"))
+- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++ sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
+ if sys.lib != 'lib':
-+ sitedirs.append(os.path.join(prefix,
++ sitepackages.append(os.path.join(prefix,
+ 'lib',
+ "python" + sys.version[:3],
+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
++ sitepackages.append(os.path.join(prefix, 'lib', "site-python"))
+
else:
- sitedirs.append(prefix)
-- sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
-+ sitedirs.append(os.path.join(prefix, sys.lib, "site-packages"))
-
+ sitepackages.append(prefix)
+- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
++ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
diff -Nur Python-2.5b2.orig/Makefile.pre.in Python-2.5b2/Makefile.pre.in
@@ -165,9 +164,9 @@
@@ -84,11 +86,11 @@
# Expanded directories
- BINDIR= $(exec_prefix)/bin
--LIBDIR= $(exec_prefix)/lib
-+LIBDIR= $(exec_prefix)/$(LIB)
+ BINDIR= @bindir@
+-LIBDIR= @libdir@
++LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
@@ -248,16 +247,16 @@
--- Python-2.5b2.orig/Python/sysmodule.c 2006-07-10 22:08:24.000000000 +0100
+++ Python-2.5b2/Python/sysmodule.c 2006-07-12 17:42:51.000000000 +0100
@@ -1377,6 +1377,10 @@
- PyString_FromString(Py_GetCopyright()));
- SET_SYS_FROM_STRING("platform",
- PyString_FromString(Py_GetPlatform()));
-+ SET_SYS_FROM_STRING("arch",
-+ PyString_FromString(Py_GetArch()));
-+ SET_SYS_FROM_STRING("lib",
-+ PyString_FromString(Py_GetLib()));
- SET_SYS_FROM_STRING("executable",
- PyString_FromString(Py_GetProgramFullPath()));
- SET_SYS_FROM_STRING("prefix",
+ PyString_FromString(Py_GetCopyright()));
+ SET_SYS_FROM_STRING("platform",
+ PyString_FromString(Py_GetPlatform()));
++ SET_SYS_FROM_STRING("arch",
++ PyString_FromString(Py_GetArch()));
++ SET_SYS_FROM_STRING("lib",
++ PyString_FromString(Py_GetLib()));
+ SET_SYS_FROM_STRING("executable",
+ PyString_FromString(Py_GetProgramFullPath()));
+ SET_SYS_FROM_STRING("prefix",
diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
--- Python-2.5b2.orig/setup.py 2006-06-30 07:18:39.000000000 +0100
+++ Python-2.5b2/setup.py 2006-07-12 17:45:14.000000000 +0100
@@ -277,19 +276,19 @@
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
@@ -496,11 +496,11 @@
- elif self.compiler.find_library_file(lib_dirs, 'curses'):
- readline_libs.append('curses')
+ elif curses_library:
+ readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr' + libname + '/termcap'],
- 'termcap'):
+- ['/usr/lib/termcap'],
++ ['/usr' + libname + '/termcap'],
+ 'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr' + libname + 'termcap'],
++ library_dirs=['/usr' + libname + '/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
- if platform not in ['mac']:
+ else:
@@ -1244,8 +1244,8 @@
added_lib_dirs.append('/usr/openwin/lib')
elif os.path.exists('/usr/X11R6/include'):
@@ -301,3 +300,29 @@
elif os.path.exists('/usr/X11R5/include'):
include_dirs.append('/usr/X11R5/include')
added_lib_dirs.append('/usr/X11R5/lib')
+--- Python-2.7/Lib/test/test_site.py~ 2010-05-14 01:59:41.000000000 +0200
++++ Python-2.7/Lib/test/test_site.py 2010-07-05 20:36:37.311186935 +0200
+@@ -166,19 +166,19 @@
+
+ if sys.platform in ('os2emx', 'riscos'):
+ self.assertEqual(len(dirs), 1)
+- wanted = os.path.join('xoxo', 'Lib', 'site-packages')
++ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
+ self.assertEquals(dirs[0], wanted)
+ elif os.sep == '/':
+ self.assertTrue(len(dirs), 2)
+- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
++ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
+ 'site-packages')
+ self.assertEquals(dirs[0], wanted)
+- wanted = os.path.join('xoxo', 'lib', 'site-python')
++ wanted = os.path.join('xoxo', sys.lib, 'site-python')
+ self.assertEquals(dirs[1], wanted)
+ else:
+ self.assertTrue(len(dirs), 2)
+ self.assertEquals(dirs[0], 'xoxo')
+- wanted = os.path.join('xoxo', 'lib', 'site-packages')
++ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
+ self.assertEquals(dirs[1], wanted)
+
+ # let's try the specific Apple location
================================================================
Index: packages/python/python-noarch_to_datadir.patch
diff -u packages/python/python-noarch_to_datadir.patch:1.10 packages/python/python-noarch_to_datadir.patch:1.11
--- packages/python/python-noarch_to_datadir.patch:1.10 Fri Oct 3 10:13:48 2008
+++ packages/python/python-noarch_to_datadir.patch Mon Jul 5 20:41:39 2010
@@ -45,21 +45,21 @@
@@ -269,13 +269,10 @@
"python" + sys.version[:3],
"site-packages"))
- sitedirs.append(os.path.join(prefix, sys.lib, "site-python"))
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
- if sys.lib != 'lib':
-- sitedirs.append(os.path.join(prefix,
+- sitepackages.append(os.path.join(prefix,
- 'lib',
- "python" + sys.version[:3],
- "site-packages"))
-- sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
+- sitepackages.append(os.path.join(prefix, 'lib', "site-python"))
-
-+ sitedirs.append(os.path.join(prefix, "share",
++ sitepackages.append(os.path.join(prefix, "share",
+ "python" + sys.version[:3],
+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, "share", "site-python"))
++ sitepackages.append(os.path.join(prefix, "share", "site-python"))
else:
- sitedirs.append(prefix)
- sitedirs.append(os.path.join(prefix, sys.lib, "site-packages"))
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
diff -Nur Python-2.5.orig/Makefile.pre.in Python-2.5/Makefile.pre.in
--- Python-2.5.orig/Makefile.pre.in 2007-03-17 16:26:13.807358000 +0000
+++ Python-2.5/Makefile.pre.in 2007-03-17 16:26:50.821671250 +0000
@@ -136,6 +136,6 @@
strncpy(zip_path, PREFIX, MAXPATHLEN);
- joinpath(zip_path, "lib/python00.zip");
+ joinpath(zip_path, LIB_PYTHON "00.zip");
- bufsz = strlen(zip_path); /* Replace "00" with version */
+ bufsz = strlen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
================================================================
Index: packages/python/python-pythonpath.patch
diff -u packages/python/python-pythonpath.patch:1.4 packages/python/python-pythonpath.patch:1.5
--- packages/python/python-pythonpath.patch:1.4 Sun Mar 14 20:20:48 2004
+++ packages/python/python-pythonpath.patch Mon Jul 5 20:41:39 2010
@@ -1,43 +1,203 @@
-diff -burN Python-2.3.3.orig/Demo/cgi/cgi1.py Python-2.3.3/Demo/cgi/cgi1.py
---- Python-2.3.3.orig/Demo/cgi/cgi1.py 2002-10-17 18:33:40.000000000 +0200
-+++ Python-2.3.3/Demo/cgi/cgi1.py 2004-03-14 19:18:34.990634848 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
-
- """CGI test 1 - check server setup."""
-
-diff -burN Python-2.3.3.orig/Demo/cgi/cgi2.py Python-2.3.3/Demo/cgi/cgi2.py
---- Python-2.3.3.orig/Demo/cgi/cgi2.py 2002-10-16 23:01:27.000000000 +0200
-+++ Python-2.3.3/Demo/cgi/cgi2.py 2004-03-14 19:18:41.993570240 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
-
- """CGI test 2 - basic use of cgi module."""
-
-diff -burN Python-2.3.3.orig/Demo/cgi/cgi3.py Python-2.3.3/Demo/cgi/cgi3.py
---- Python-2.3.3.orig/Demo/cgi/cgi3.py 2002-10-17 17:53:02.000000000 +0200
-+++ Python-2.3.3/Demo/cgi/cgi3.py 2004-03-14 19:18:46.984811456 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
-
- """CGI test 3 (persistent data)."""
+diff -urN Python-2.7.org/Demo/tix/INSTALL.txt Python-2.7/Demo/tix/INSTALL.txt
+--- Python-2.7.org/Demo/tix/INSTALL.txt 2001-11-11 15:07:37.000000000 +0100
++++ Python-2.7/Demo/tix/INSTALL.txt 2010-07-05 20:00:03.472866047 +0200
+@@ -71,7 +71,7 @@
+ You should now have a working Tix implementation in Python. To see if all
+ is as it should be, run the 'tixwidgets.py' script in the Demo/tix directory.
+ Under X windows, do
+- /usr/local/bin/python Demo/tix/tixwidgets.py
++ /usr/bin/python Demo/tix/tixwidgets.py
+
+ If this does not work, you may need to tell python where to find
+ the Tcl, Tk and Tix library files. This is done by setting the
+@@ -80,7 +80,7 @@
+ env TCL_LIBRARY=/usr/local/lib/tcl8.3 \
+ TK_LIBRARY=/usr/local/lib/tk8.3 \
+ TIX_LIBRARY=/usr/local/lib/tix8.1 \
+- /usr/local/bin/python Demo/tix/tixwidgets.py
++ /usr/bin/python Demo/tix/tixwidgets.py
+
+
+ If you find any bugs or have suggestions for improvement, please report them
+diff -urN Python-2.7.org/Doc/c-api/init.rst Python-2.7/Doc/c-api/init.rst
+--- Python-2.7.org/Doc/c-api/init.rst 2010-06-14 17:58:39.000000000 +0200
++++ Python-2.7/Doc/c-api/init.rst 2010-07-05 20:00:03.475503986 +0200
+@@ -196,7 +196,7 @@
+ Return the *prefix* for installed platform-independent files. This is derived
+ through a number of complicated rules from the program name set with
+ :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
+- program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
++ program name is ``'/usr/bin/python'``, the prefix is ``'/usr/local'``. The
+ returned string points into static storage; the caller should not modify its
+ value. This corresponds to the :makevar:`prefix` variable in the top-level
+ :file:`Makefile` and the :option:`--prefix` argument to the :program:`configure`
+@@ -209,7 +209,7 @@
+ Return the *exec-prefix* for installed platform-*dependent* files. This is
+ derived through a number of complicated rules from the program name set with
+ :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
+- program name is ``'/usr/local/bin/python'``, the exec-prefix is
++ program name is ``'/usr/bin/python'``, the exec-prefix is
+ ``'/usr/local'``. The returned string points into static storage; the caller
+ should not modify its value. This corresponds to the :makevar:`exec_prefix`
+ variable in the top-level :file:`Makefile` and the :option:`--exec-prefix`
+diff -urN Python-2.7.org/Doc/c-api/intro.rst Python-2.7/Doc/c-api/intro.rst
+--- Python-2.7.org/Doc/c-api/intro.rst 2010-06-11 02:23:01.000000000 +0200
++++ Python-2.7/Doc/c-api/intro.rst 2010-07-05 20:00:03.482863587 +0200
+@@ -541,7 +541,7 @@
+ path (the environment variable :envvar:`PATH`).
+
+ For instance, if the Python executable is found in
+-:file:`/usr/local/bin/python`, it will assume that the libraries are in
++:file:`/usr/bin/python`, it will assume that the libraries are in
+ :file:`/usr/local/lib/python{X.Y}`. (In fact, this particular path is also
+ the "fallback" location, used when no executable file named :file:`python` is
+ found along :envvar:`PATH`.) The user can override this behavior by setting the
+diff -urN Python-2.7.org/Doc/faq/library.rst Python-2.7/Doc/faq/library.rst
+--- Python-2.7.org/Doc/faq/library.rst 2010-03-12 10:57:43.000000000 +0100
++++ Python-2.7/Doc/faq/library.rst 2010-07-05 20:00:03.486197135 +0200
+@@ -54,7 +54,7 @@
+ The second can be done in a number of ways. The most straightforward way is to
+ write ::
+
+- #!/usr/local/bin/python
++ #!/usr/bin/python
+
+ as the very first line of your file, using the pathname for where the Python
+ interpreter is installed on your platform.
+@@ -650,7 +650,7 @@
+
+ Yes. Here's a simple example that uses httplib::
+
+- #!/usr/local/bin/python
++ #!/usr/bin/python
+
+ import httplib, sys, time
+
+diff -urN Python-2.7.org/Doc/install/index.rst Python-2.7/Doc/install/index.rst
+--- Python-2.7.org/Doc/install/index.rst 2009-10-28 00:06:10.000000000 +0100
++++ Python-2.7/Doc/install/index.rst 2010-07-05 20:00:03.506197416 +0200
+@@ -369,12 +369,12 @@
+
+ Another possibility is a network filesystem where the name used to write to a
+ remote directory is different from the name used to read it: for example, the
+-Python interpreter accessed as :file:`/usr/local/bin/python` might search for
++Python interpreter accessed as :file:`/usr/bin/python` might search for
+ modules in :file:`/usr/local/lib/python2.{X}`, but those modules would have to
+ be installed to, say, :file:`/mnt/{@server}/export/lib/python2.{X}`. This could
+ be done with ::
+
+- /usr/local/bin/python setup.py install --prefix=/mnt/@server/export
++ /usr/bin/python setup.py install --prefix=/mnt/@server/export
+
+ In either case, the :option:`--prefix` option defines the installation base, and
+ the :option:`--exec-prefix` option defines the platform-specific installation
+diff -urN Python-2.7.org/Doc/library/cgi.rst Python-2.7/Doc/library/cgi.rst
+--- Python-2.7.org/Doc/library/cgi.rst 2009-08-17 21:26:49.000000000 +0200
++++ Python-2.7/Doc/library/cgi.rst 2010-07-05 20:00:03.509530626 +0200
+@@ -387,7 +387,7 @@
+ first line of the script contains ``#!`` starting in column 1 followed by the
+ pathname of the Python interpreter, for instance::
+
+- #!/usr/local/bin/python
++ #!/usr/bin/python
+
+ Make sure the Python interpreter exists and is executable by "others".
+
+diff -urN Python-2.7.org/Doc/library/pickle.rst Python-2.7/Doc/library/pickle.rst
+--- Python-2.7.org/Doc/library/pickle.rst 2009-04-27 17:29:09.000000000 +0200
++++ Python-2.7/Doc/library/pickle.rst 2010-07-05 20:00:03.512863651 +0200
+@@ -737,7 +737,7 @@
+ reading resumes from the last location. The :meth:`__setstate__` and
+ :meth:`__getstate__` methods are used to implement this behavior. ::
+
+- #!/usr/local/bin/python
++ #!/usr/bin/python
+
+ class TextReader:
+ """Print and number lines in a text file."""
+@@ -774,7 +774,7 @@
+ >>> import TextReader
+ >>> obj = TextReader.TextReader("TextReader.py")
+ >>> obj.readline()
+- '1: #!/usr/local/bin/python'
++ '1: #!/usr/bin/python'
+ >>> obj.readline()
+ '2: '
+ >>> obj.readline()
+diff -urN Python-2.7.org/Doc/tutorial/interpreter.rst Python-2.7/Doc/tutorial/interpreter.rst
+--- Python-2.7.org/Doc/tutorial/interpreter.rst 2010-04-10 13:16:59.000000000 +0200
++++ Python-2.7/Doc/tutorial/interpreter.rst 2010-07-05 20:00:03.516196870 +0200
+@@ -10,7 +10,7 @@
+ Invoking the Interpreter
+ ========================
-diff -burN Python-2.3.3.orig/Lib/cgi.py Python-2.3.3/Lib/cgi.py
---- Python-2.3.3.orig/Lib/cgi.py 2003-02-27 21:14:32.000000000 +0100
-+++ Python-2.3.3/Lib/cgi.py 2004-03-14 19:18:16.120503544 +0100
-@@ -1,4 +1,4 @@
+-The Python interpreter is usually installed as :file:`/usr/local/bin/python` on
++The Python interpreter is usually installed as :file:`/usr/bin/python` on
+ those machines where it is available; putting :file:`/usr/local/bin` in your
+ Unix shell's search path makes it possible to start it by typing the command ::
+
+diff -urN Python-2.7.org/Lib/cgi.py Python-2.7/Lib/cgi.py
+--- Python-2.7.org/Lib/cgi.py 2010-03-17 21:05:11.000000000 +0100
++++ Python-2.7/Lib/cgi.py 2010-07-05 20:00:03.522865338 +0200
+@@ -1,6 +1,6 @@
-#! /usr/local/bin/python
+#! /usr/bin/python
- # NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
+-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
++# NOTE: the above "/usr/bin/python" is NOT a mistake. It is
# intentionally NOT "/usr/bin/env python". On many systems
-diff -burN Python-2.3.3.orig/Misc/HISTORY Python-2.3.3/Misc/HISTORY
---- Python-2.3.3.orig/Misc/HISTORY 2003-10-20 16:34:46.000000000 +0200
-+++ Python-2.3.3/Misc/HISTORY 2004-03-14 19:18:16.148499288 +0100
-@@ -7239,9 +7239,9 @@
+ # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
+ # scripts, and /usr/local/bin is the default directory where Python is
+diff -urN Python-2.7.org/Mac/PythonLauncher/factorySettings.plist Python-2.7/Mac/PythonLauncher/factorySettings.plist
+--- Python-2.7.org/Mac/PythonLauncher/factorySettings.plist 2004-07-16 14:34:23.000000000 +0200
++++ Python-2.7/Mac/PythonLauncher/factorySettings.plist 2010-07-05 20:00:03.526197587 +0200
+@@ -10,7 +10,7 @@
+ <false/>
+ <key>interpreter_list</key>
+ <array>
+- <string>/usr/local/bin/pythonw</string>
++ <string>/usr/bin/pythonw</string>
+ <string>/usr/bin/pythonw</string>
+ <string>/sw/bin/pythonw</string>
+ </array>
+@@ -35,8 +35,8 @@
+ <false/>
+ <key>interpreter_list</key>
+ <array>
+- <string>/usr/local/bin/pythonw</string>
+- <string>/usr/local/bin/python</string>
++ <string>/usr/bin/pythonw</string>
++ <string>/usr/bin/python</string>
+ <string>/usr/bin/pythonw</string>
+ <string>/usr/bin/python</string>
+ <string>/sw/bin/pythonw</string>
+@@ -63,8 +63,8 @@
+ <false/>
+ <key>interpreter_list</key>
+ <array>
+- <string>/usr/local/bin/pythonw</string>
+- <string>/usr/local/bin/python</string>
++ <string>/usr/bin/pythonw</string>
++ <string>/usr/bin/python</string>
+ <string>/usr/bin/pythonw</string>
+ <string>/usr/bin/python</string>
+ <string>/sw/bin/pythonw</string>
+diff -urN Python-2.7.org/Mac/README Python-2.7/Mac/README
+--- Python-2.7.org/Mac/README 2010-04-30 17:11:22.000000000 +0200
++++ Python-2.7/Mac/README 2010-07-05 20:00:03.529530323 +0200
+@@ -213,7 +213,7 @@
+ to be supplied later. Some useful (but outdated) info can be found in
+ Mac/Demo.
+
+-The commandline scripts /usr/local/bin/python and pythonw can be used to run
++The commandline scripts /usr/bin/python and pythonw can be used to run
+ non-GUI and GUI python scripts from the command line, respectively.
+
+ How do I create a binary distribution?
+diff -urN Python-2.7.org/Misc/HISTORY Python-2.7/Misc/HISTORY
+--- Python-2.7.org/Misc/HISTORY 2010-03-07 16:23:59.000000000 +0100
++++ Python-2.7/Misc/HISTORY 2010-07-05 20:00:03.576196805 +0200
+@@ -13236,9 +13236,9 @@
were invoked.
- It is now recommended to use ``#!/usr/bin/env python'' instead of
@@ -49,7 +209,7 @@
never have to be edited when the Python interpreter lives in a
non-standard place. Note that this doesn't work for CGI scripts since
the python executable often doesn't live in the HTTP server's default
-@@ -10526,7 +10526,7 @@
+@@ -16523,7 +16523,7 @@
Python exits or receives a SIGTERM or SIGHUP signal.
The interpreter is now generally assumed to live in
@@ -58,15 +218,64 @@
demo/scripts/fixps.py will update old scripts in place (you can easily
modify it to do other similar changes).
-diff -burN Python-2.3.3.orig/Tools/faqwiz/faqw.py Python-2.3.3/Tools/faqwiz/faqw.py
---- Python-2.3.3.orig/Tools/faqwiz/faqw.py 1998-04-04 00:27:04.000000000 +0200
-+++ Python-2.3.3/Tools/faqwiz/faqw.py 2004-03-14 19:18:16.150498984 +0100
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#! /usr/bin/python
-
- """FAQ wizard bootstrap."""
-
+diff -urN Python-2.7.org/Misc/RPM/python-2.7.spec Python-2.7/Misc/RPM/python-2.7.spec
+--- Python-2.7.org/Misc/RPM/python-2.7.spec 2010-07-03 15:56:13.000000000 +0200
++++ Python-2.7/Misc/RPM/python-2.7.spec 2010-07-05 20:00:03.579531210 +0200
+@@ -159,10 +159,10 @@
+
+ * Sat Mar 27 2004 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.2-3pydotorg]
+ - Being more agressive about finding the paths to fix for
+- #!/usr/local/bin/python.
++ #!/usr/bin/python.
+
+ * Sat Feb 07 2004 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.3-2pydotorg]
+-- Adding code to remove "#!/usr/local/bin/python" from particular files and
++- Adding code to remove "#!/usr/bin/python" from particular files and
+ causing the RPM build to terminate if there are any unexpected files
+ which have that line in them.
+
+@@ -317,7 +317,7 @@
+
+ # fix the #! line in installed files
+ find "$RPM_BUILD_ROOT" -type f -print0 |
+- xargs -0 grep -l /usr/local/bin/python | while read file
++ xargs -0 grep -l /usr/bin/python | while read file
+ do
+ FIXFILE="$file"
+ sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
+@@ -327,7 +327,7 @@
+ done
+
+ # check to see if there are any straggling #! lines
+-find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \
++find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/bin/python' \
+ | grep ':1:#!' >/tmp/python-rpm-files.$$ || true
+ if [ -s /tmp/python-rpm-files.$$ ]
+ then
+@@ -335,7 +335,7 @@
+ cat /tmp/python-rpm-files.$$
+ cat <<@EOF
+ *****************************************************
+- There are still files referencing /usr/local/bin/python in the
++ There are still files referencing /usr/bin/python in the
+ install directory. They are listed above. Please fix the .spec
+ file and try again. If you are an end-user, you probably want
+ to report this to jafo-rpms at tummy.com as well.
+diff -urN Python-2.7.org/README Python-2.7/README
+--- Python-2.7.org/README 2010-07-03 15:56:13.000000000 +0200
++++ Python-2.7/README 2010-07-05 20:00:03.586197142 +0200
+@@ -331,7 +331,7 @@
+ 1.5.2 on most older Red Hat installations; several key Red Hat tools
+ require this version. Python 2.1.x may be installed as
+ /usr/bin/python2. The Makefile installs Python as
+- /usr/local/bin/python, which may or may not take precedence
++ /usr/bin/python, which may or may not take precedence
+ over /usr/bin/python, depending on how you have set up $PATH.
+
+ FreeBSD 3.x and probably platforms with NCurses that use libmytinfo or
+diff -urN Python-2.7.org/Tools/faqwiz/faqw.py Python-2.7/Tools/faqwiz/faqw.py
+--- Python-2.7.org/Tools/faqwiz/faqw.py 2010-03-11 23:33:25.000000000 +0100
++++ Python-2.7/Tools/faqwiz/faqw.py 2010-07-05 20:00:03.589530209 +0200
@@ -10,7 +10,7 @@
# executable.
@@ -76,9 +285,30 @@
# interpreter lives, change the value for FAQDIR to where your FAQ
# lives, and change the value for SRCDIR to where your faqwiz.py
# module lives. The faqconf.py and faqcust.py files live there, too.
-diff -burN Python-2.3.3.orig/Tools/scripts/fixps.py Python-2.3.3/Tools/scripts/fixps.py
---- Python-2.3.3.orig/Tools/scripts/fixps.py 2003-05-13 20:14:24.000000000 +0200
-+++ Python-2.3.3/Tools/scripts/fixps.py 2004-03-14 19:18:16.151498832 +0100
+diff -urN Python-2.7.org/Tools/pybench/pybench.py Python-2.7/Tools/pybench/pybench.py
+--- Python-2.7.org/Tools/pybench/pybench.py 2009-10-09 16:32:19.000000000 +0200
++++ Python-2.7/Tools/pybench/pybench.py 2010-07-05 20:00:03.592863527 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python -O
++#!/usr/bin/python -O
+
+ """ A Python Benchmark Suite
+
+diff -urN Python-2.7.org/Tools/pybench/README Python-2.7/Tools/pybench/README
+--- Python-2.7.org/Tools/pybench/README 2006-06-13 20:56:56.000000000 +0200
++++ Python-2.7/Tools/pybench/README 2010-07-05 20:00:03.596196761 +0200
+@@ -141,7 +141,7 @@
+ Processor: x86_64
+
+ Python:
+- Executable: /usr/local/bin/python
++ Executable: /usr/bin/python
+ Version: 2.4.2
+ Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
+ Bits: 64bit
+diff -urN Python-2.7.org/Tools/scripts/fixps.py Python-2.7/Tools/scripts/fixps.py
+--- Python-2.7.org/Tools/scripts/fixps.py 2004-08-09 19:27:55.000000000 +0200
++++ Python-2.7/Tools/scripts/fixps.py 2010-07-05 20:00:03.599292989 +0200
@@ -15,13 +15,13 @@
print filename, ': can\'t open :', msg
continue
@@ -94,14 +324,17 @@
- line = re.sub('/usr/local/bin/python',
+ line = re.sub('/usr/bin/python',
'/usr/bin/env python', line)
- print filename, ':', `line`
+ print filename, ':', repr(line)
f = open(filename, "w")
-diff -burN Python-2.3.3.orig/Tools/scripts/parseentities.py Python-2.3.3/Tools/scripts/parseentities.py
---- Python-2.3.3.orig/Tools/scripts/parseentities.py 2001-01-17 09:48:39.000000000 +0100
-+++ Python-2.3.3/Tools/scripts/parseentities.py 2004-03-14 19:19:23.258297048 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- """ Utility for parsing HTML entity definitions available from:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-ac_fixes.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-lib64.patch?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-noarch_to_datadir.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-pythonpath.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python.spec?r1=1.359&r2=1.360&f=u
More information about the pld-cvs-commit
mailing list