Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at Tue Sep 20 09:35:21 CEST 2011.
-------- --- python/python-base.changes 2011-07-22 15:05:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-base.changes 2011-08-23 21:55:31.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Aug 19 22:37:42 CEST 2011 - [email protected] + +- update to 2.7.2: + * Bug fix only release, see + http://hg.python.org/cpython/raw-file/eb3c9b74884c/Misc/NEWS + for details +- introduce a pre_checkin.sh file that synchronizes + patches between python and python-base +- rediff patches for 2.7.2 +- replace kernel3 patch with the upstream solution + +------------------------------------------------------------------- --- python/python.changes 2011-07-11 02:00:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python.changes 2011-09-16 18:22:41.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 16 16:21:44 UTC 2011 - [email protected] + +- dropped newslist.py from demos because of bad license + (bnc#718009) + +------------------------------------------------------------------- @@ -4,2 +10,8 @@ -- fix build on factory: setup reports linux3 not linux2 now, - adapt checks +- update to 2.7.2: + * Bug fix only release, see + http://hg.python.org/cpython/raw-file/eb3c9b74884c/Misc/NEWS + for details +- introduce a pre_checkin.sh file that synchronizes + patches between python and python-base +- rediff patches for 2.7.2 +- replace kernel3 patch with the upstream solution calling whatdependson for head-i586 Old: ---- Python-2.7.1.tar.bz2 python-2.7-CVE-2011-1521-fileurl.patch python-2.7-fix-parallel-make.patch python-2.7.1-fix_date_time_compiler.patch python-2.7.1-linux3.patch python-2.7.1-multilib.patch New: ---- Python-2.7.2.tar.bz2 pre_checkin.sh python-2.7.1-urllib-noproxy.patch python-2.7.2-fix_date_time_compiler.patch python-2.7.2-linux3.patch python-2.7.2-multilib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.pDjLAc/_old 2011-09-20 09:35:15.000000000 +0200 +++ /var/tmp/diff_new_pack.pDjLAc/_new 2011-09-20 09:35:15.000000000 +0200 @@ -29,8 +29,8 @@ %endif # Summary: Python Interpreter base package -Version: 2.7.1 -Release: 4 +Version: 2.7.2 +Release: 1 %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -39,20 +39,22 @@ Source3: README.SUSE Source4: distutils.cfg Source5: _local.pth - +# COMMON-PATCH-BEGIN Patch1: python-2.7-dirs.patch Patch2: python-distutils-rpm-8.patch -Patch3: python-2.7.1-multilib.patch -Patch4: python-2.7rc2-canonicalize2.patch -Patch5: python-2.7rc2-configure.patch -Patch6: python-2.6-gettext-plurals.patch -Patch7: python-2.7.1-distutils_test_path.patch -Patch8: sparc_longdouble.patch +Patch3: python-2.7.2-multilib.patch +Patch4: python-2.5.1-sqlite.patch +Patch5: python-2.7rc2-canonicalize2.patch +Patch6: python-2.7rc2-configure.patch +Patch7: python-2.6-gettext-plurals.patch +Patch8: python-2.6b3-curses-panel.patch +Patch9: python-2.7.1-distutils_test_path.patch +Patch10: sparc_longdouble.patch +Patch11: python-2.7.2-linux3.patch Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch -Patch13: python-2.7.1-fix_date_time_compiler.patch -Patch14: python-2.7-CVE-2011-1521-fileurl.patch -Patch15: python-2.7-fix-parallel-make.patch -Patch16: python-2.7.1-linux3.patch +Patch13: python-2.7.2-fix_date_time_compiler.patch +Patch14: python-2.7.1-urllib-noproxy.patch +# COMMON-PATCH-END BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) Provides: %{name} = %{python_version} @@ -137,19 +139,22 @@ %prep %setup -q -n %{tarname} # patching +# COMMON-PREP-BEGIN %patch1 -p1 %patch2 -p1 -%patch3 -p1 +%patch3 %patch4 %patch5 %patch6 -%patch7 -p1 -%patch8 -p1 +%patch7 +%patch8 +%patch9 -p1 +%patch10 -p1 +%patch11 %patch12 -%patch13 -p1 +%patch13 %patch14 -p1 -%patch15 -p1 -%patch16 -p1 +# COMMON-PREP-END # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.in @@ -162,9 +167,6 @@ # provide a stable timestamp touch -r %{S:0} Makefile.pre.in -# Cheat for kernel 3.0 -cp -r Lib/plat-linux2 Lib/plat-linux3 - # prevent make from trying to rebuild asdl stuff, which requires existing # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h @@ -246,7 +248,7 @@ rm -f $CLEANUP_DIR/lib-dynload/audioop.so # remove various things that don't need to be in python-base rm $RPM_BUILD_ROOT%{_bindir}/idle -rm -r $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3} +rm -rf $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3} rm $CLEANUP_DIR/ssl.py* # does not work without _ssl.so anyway # replace duplicate .pyo/.pyc with hardlinks ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.pDjLAc/_old 2011-09-20 09:35:16.000000000 +0200 +++ /var/tmp/diff_new_pack.pDjLAc/_new 2011-09-20 09:35:16.000000000 +0200 @@ -24,8 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 12 -%define pyver 2.7.1 +Release: 5 +%define pyver 2.7.2 BuildArch: noarch %define tarname Python-%{pyver} %define pyname python ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.pDjLAc/_old 2011-09-20 09:35:16.000000000 +0200 +++ /var/tmp/diff_new_pack.pDjLAc/_new 2011-09-20 09:35:16.000000000 +0200 @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: python BuildRequires: db-devel fdupes gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel #Requires: openssl >= 0.9.8e @@ -31,8 +29,8 @@ # Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter -Version: 2.7.1 -Release: 11 +Version: 2.7.2 +Release: 5 Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} @@ -43,18 +41,28 @@ Source4: python.csh #Source11: testfiles.tar.bz2 # issues with copyrighted Unicode testing files + +# !!!!!!!!!!!!!! +# do not add or edit patches here. please edit python-base.spec +# instead and run pre_checkin.sh +# !!!!!!!!!!!!!! +# COMMON-PATCH-BEGIN Patch1: python-2.7-dirs.patch -Patch2: python-2.7.1-multilib.patch -Patch3: python-2.7rc2-canonicalize2.patch +Patch2: python-distutils-rpm-8.patch +Patch3: python-2.7.2-multilib.patch Patch4: python-2.5.1-sqlite.patch -Patch5: python-2.7rc2-configure.patch -Patch6: python-2.6b3-curses-panel.patch -Patch7: sparc_longdouble.patch -Patch9: python-2.7.1-fix_date_time_compiler.patch -Patch10: python-2.7-fix-parallel-make.patch -Patch11: python-2.7.1-linux3.patch +Patch5: python-2.7rc2-canonicalize2.patch +Patch6: python-2.7rc2-configure.patch +Patch7: python-2.6-gettext-plurals.patch +Patch8: python-2.6b3-curses-panel.patch +Patch9: python-2.7.1-distutils_test_path.patch +Patch10: sparc_longdouble.patch +Patch11: python-2.7.2-linux3.patch +Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch +Patch13: python-2.7.2-fix_date_time_compiler.patch +Patch14: python-2.7.1-urllib-noproxy.patch +# COMMON-PATCH-END BuildRoot: %{_tmppath}/%{name}-%{version}-build - %define python_version %(echo %{version} | head -c 3) %define idle_name idle Provides: %{name} = %{python_version} @@ -68,8 +76,6 @@ If you want to install third party modules using distutils, you need to install python-devel package. - - Authors: -------- Guido van Rossum <[email protected]> @@ -87,8 +93,6 @@ colorizing, and many other things, as well as a Python shell window and a debugger. - - Authors: -------- Guido van Rossum <[email protected]> @@ -106,8 +110,6 @@ Various demonstrations of what you can do with Python and a number of programs that are useful for building or extending Python. - - Authors: -------- Guido van Rossum <[email protected]> @@ -128,8 +130,6 @@ Python interface to Tk. Tk is the GUI toolkit that comes with Tcl. The "xrpm" package uses this Python interface. - - Authors: -------- Guido van Rossum <[email protected]> @@ -147,8 +147,6 @@ An easy to use interface to the (n)curses CUI library. CUI stands for Console User Interface. - - Authors: -------- Guido van Rossum <[email protected]> @@ -166,29 +164,35 @@ An easy to use interface for GDBM databases. GDBM is the GNU implementation of the standard Unix DBM databases. - - Authors: -------- Guido van Rossum <[email protected]> %prep %setup -q -n %{tarname} -# patching +# COMMON-PREP-BEGIN %patch1 -p1 %patch2 -p1 %patch3 %patch4 %patch5 %patch6 -%patch7 -p1 +%patch7 +%patch8 %patch9 -p1 %patch10 -p1 -%patch11 -p1 +%patch11 +%patch12 +%patch13 +%patch14 -p1 +# COMMON-PREP-END # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.in +# remove newslist.py because of bad license +rm Demo/scripts/newslist.* + %build # necessary for correct linking with GDBM: export SUSE_ASNEEDED=0 ++++++ Python-2.7.1.tar.bz2 -> Python-2.7.2.tar.bz2 ++++++ python/Python-2.7.1.tar.bz2 /mounts/work_src_done/STABLE/python/Python-2.7.2.tar.bz2 differ: char 11, line 1 ++++++ pre_checkin.sh ++++++ #!/bin/bash # This script is called automatically during autobuild checkin. for spec in python.spec; do { sed -n -e '1,/COMMON-PATCH-BEGIN/p' $spec sed -n -e '/COMMON-PATCH-BEGIN/,/COMMON-PATCH-END/p' python-base.spec sed -n -e '/COMMON-PATCH-END/,/COMMON-PREP-BEGIN/p' $spec sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' python-base.spec sed -n -e '/COMMON-PREP-END/,$p' $spec; } | uniq > $spec.tmp && mv $spec.tmp $spec done ++++++ python-2.7.1-urllib-noproxy.patch ++++++ Index: Python-2.7.1/Lib/urllib.py =================================================================== --- Python-2.7.1.orig/Lib/urllib.py +++ Python-2.7.1/Lib/urllib.py @@ -1350,6 +1350,7 @@ def proxy_bypass_environment(host): hostonly, port = splitport(host) # check if the host ends with any of the DNS suffixes for name in no_proxy.split(','): + name = name.strip() if name and (hostonly.endswith(name) or host.endswith(name)): return 1 # otherwise, don't bypass ++++++ python-2.7.1-fix_date_time_compiler.patch -> python-2.7.2-fix_date_time_compiler.patch ++++++ --- python/python-2.7.1-fix_date_time_compiler.patch 2011-05-24 17:30:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-2.7.2-fix_date_time_compiler.patch 2011-08-19 22:41:44.000000000 +0200 @@ -1,21 +1,18 @@ -Index: Python-3.2/Makefile.pre.in -=================================================================== ---- Python-3.2.orig/Makefile.pre.in -+++ Python-3.2/Makefile.pre.in -@@ -554,7 +554,15 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ - $(SIGNAL_OBJS) \ - $(MODOBJS) \ - $(srcdir)/Modules/getbuildinfo.c -- $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c -+ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \ -+ -DDATE="\"`LC_ALL=C date -u -r Makefile.pre.in +"%b %d %Y"`\"" \ -+ -DTIME="\"`LC_ALL=C date -u -r Makefile.pre.in +"%T"`\"" \ -+ -o $@ $(srcdir)/Modules/getbuildinfo.c -+ +--- Makefile.pre.in ++++ Makefile.pre.in +@@ -524,8 +524,15 @@ + -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \ + -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \ + -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \ ++ -DDATE="\"`LC_ALL=C date -u -r Makefile.pre.in +"%b %d %Y"`\"" \ ++ -DTIME="\"`LC_ALL=C date -u -r Makefile.pre.in +"%T"`\"" \ + -o $@ $(srcdir)/Modules/getbuildinfo.c + +Python/getcompiler.o: $(srcdir)/Python/getcompiler.c Makefile + $(CC) -c $(PY_CFLAGS) \ + -DCOMPILER='"[GCC]"' \ + -o $@ $(srcdir)/Python/getcompiler.c - ++ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ + -DPREFIX='"$(prefix)"' \ ++++++ python-2.7.1-linux3.patch -> python-2.7.2-linux3.patch ++++++ --- python/python-2.7.1-linux3.patch 2011-07-12 10:20:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-2.7.2-linux3.patch 2011-08-23 21:54:54.000000000 +0200 @@ -1,20 +1,21 @@ ---- Python-2.7.1/setup.py 2011/07/10 23:56:34 1.1 -+++ Python-2.7.1/setup.py 2011/07/10 23:57:47 -@@ -1454,14 +1454,14 @@ +--- configure.in ++++ configure.in +@@ -293,6 +293,7 @@ + MACHDEP="$ac_md_system$ac_md_release" + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; +--- Misc/NEWS ++++ Misc/NEWS +@@ -1,6 +1,8 @@ + Python News + +++++++++++ - # Platform-specific libraries -- if platform == 'linux2': -+ if (platform in ('linux2', 'linux3')): - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - else: - missing.append('linuxaudiodev') ++- Issue #12326: sys.platform is now always 'linux2' on Linux, even if Python ++ is compiled on Linux 3. -- if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', -- 'freebsd7', 'freebsd8') -+ if (platform in ('linux2', 'linux3', 'freebsd4', 'freebsd5', -+ 'freebsd6', 'freebsd7', 'freebsd8') - or platform.startswith("gnukfreebsd")): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - else: + What's New in Python 2.7.2? + =========================== ++++++ python-2.7.1-multilib.patch -> python-2.7.2-multilib.patch ++++++ --- python/python-2.7.1-multilib.patch 2011-05-24 17:30:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-2.7.2-multilib.patch 2011-08-19 22:41:44.000000000 +0200 @@ -1,8 +1,50 @@ -Index: Python-2.7.1/Include/pythonrun.h -=================================================================== ---- Python-2.7.1.orig/Include/pythonrun.h -+++ Python-2.7.1/Include/pythonrun.h -@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void); +--- configure.in ++++ configure.in +@@ -629,6 +629,41 @@ + ;; + esac + ++AC_SUBST(ARCH) ++AC_MSG_CHECKING(ARCH) ++ARCH=`uname -m` ++case $ARCH in ++i?86) ARCH=i386;; ++esac ++AC_MSG_RESULT($ARCH) ++ ++AC_SUBST(LIB) ++AC_MSG_CHECKING(LIB) ++case $ac_sys_system in ++Linux*) ++ # Test if the compiler is 64bit ++ echo 'int i;' > conftest.$ac_ext ++ python_cv_cc_64bit_output=no ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *"ELF 64"*) ++ python_cv_cc_64bit_output=yes ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++case $ARCH:$python_cv_cc_64bit_output in ++ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) ++ LIB="lib64" ++ ;; ++*:*) ++ LIB="lib" ++ ;; ++esac ++AC_MSG_RESULT($LIB) + + AC_SUBST(LIBRARY) + AC_MSG_CHECKING(LIBRARY) +--- Include/pythonrun.h ++++ Include/pythonrun.h +@@ -108,6 +108,8 @@ /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); @@ -11,11 +53,9 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.1/Lib/distutils/command/install.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/command/install.py -+++ Python-2.7.1/Lib/distutils/command/install.py -@@ -22,6 +22,8 @@ from site import USER_BASE +--- Lib/distutils/command/install.py ++++ Lib/distutils/command/install.py +@@ -22,6 +22,8 @@ from site import USER_SITE @@ -24,7 +64,7 @@ if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', -@@ -42,7 +44,7 @@ else: +@@ -42,7 +44,7 @@ INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', @@ -33,11 +73,9 @@ 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.1/Lib/distutils/sysconfig.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/sysconfig.py -+++ Python-2.7.1/Lib/distutils/sysconfig.py -@@ -114,8 +114,11 @@ def get_python_lib(plat_specific=0, stan +--- Lib/distutils/sysconfig.py ++++ Lib/distutils/sysconfig.py +@@ -114,8 +114,11 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -51,11 +89,9 @@ if standard_lib: return libpython else: -Index: Python-2.7.1/Lib/pydoc.py -=================================================================== ---- Python-2.7.1.orig/Lib/pydoc.py -+++ Python-2.7.1/Lib/pydoc.py -@@ -349,7 +349,7 @@ class Doc: +--- Lib/pydoc.py ++++ Lib/pydoc.py +@@ -352,7 +352,7 @@ docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library";) @@ -64,11 +100,9 @@ "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-2.7.1/Lib/site.py -=================================================================== ---- Python-2.7.1.orig/Lib/site.py -+++ Python-2.7.1/Lib/site.py -@@ -290,13 +290,18 @@ def getsitepackages(): +--- Lib/site.py ++++ Lib/site.py +@@ -300,13 +300,18 @@ if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -90,10 +124,38 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-2.7.1/Lib/test/test_dl.py -=================================================================== ---- Python-2.7.1.orig/Lib/test/test_dl.py -+++ Python-2.7.1/Lib/test/test_dl.py +--- Lib/sysconfig.py ++++ Lib/sysconfig.py +@@ -7,10 +7,10 @@ + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', ++ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', + 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', +@@ -65,10 +65,10 @@ + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', ++ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', ++ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', + 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', +--- Lib/test/test_dl.py ++++ Lib/test/test_dl.py @@ -5,10 +5,11 @@ import unittest from test.test_support import verbose, import_module @@ -108,11 +170,31 @@ ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.1/Lib/trace.py -=================================================================== ---- Python-2.7.1.orig/Lib/trace.py -+++ Python-2.7.1/Lib/trace.py -@@ -762,10 +762,10 @@ def main(argv=None): +--- Lib/test/test_site.py ++++ Lib/test/test_site.py +@@ -227,12 +227,16 @@ + wanted = os.path.join('xoxo', 'Lib', 'site-packages') + self.assertEqual(dirs[0], wanted) + elif os.sep == '/': +- self.assertEqual(len(dirs), 2) + wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], + 'site-packages') +- self.assertEqual(dirs[0], wanted) ++ self.assertTrue(wanted in dirs) + wanted = os.path.join('xoxo', 'lib', 'site-python') +- self.assertEqual(dirs[1], wanted) ++ self.assertTrue(wanted in dirs) ++ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3], ++ 'site-packages') ++ self.assertTrue(wanted in dirs) ++ wanted = os.path.join('xoxo', sys.lib, 'site-python') ++ self.assertTrue(wanted in dirs) + else: + self.assertEqual(len(dirs), 2) + self.assertEqual(dirs[0], 'xoxo') +--- Lib/trace.py ++++ Lib/trace.py +@@ -762,10 +762,10 @@ # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -125,11 +207,9 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.1/Makefile.pre.in -=================================================================== ---- Python-2.7.1.orig/Makefile.pre.in -+++ Python-2.7.1/Makefile.pre.in -@@ -78,6 +78,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG +--- Makefile.pre.in ++++ Makefile.pre.in +@@ -81,6 +81,8 @@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -138,7 +218,7 @@ # Install prefix for architecture-independent files prefix= @prefix@ -@@ -530,6 +532,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -532,6 +534,7 @@ -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -146,7 +226,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -561,7 +564,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) +@@ -566,7 +569,7 @@ Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -155,10 +235,8 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.1/Modules/getpath.c -=================================================================== ---- Python-2.7.1.orig/Modules/getpath.c -+++ Python-2.7.1/Modules/getpath.c +--- Modules/getpath.c ++++ Modules/getpath.c @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -173,7 +251,7 @@ #endif #ifndef LANDMARK -@@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1]; +@@ -129,7 +131,7 @@ static char exec_prefix[MAXPATHLEN+1]; static char progpath[MAXPATHLEN+1]; static char *module_search_path = NULL; @@ -182,11 +260,9 @@ static void reduce(char *dir) -Index: Python-2.7.1/Python/getplatform.c -=================================================================== ---- Python-2.7.1.orig/Python/getplatform.c -+++ Python-2.7.1/Python/getplatform.c -@@ -10,3 +10,23 @@ Py_GetPlatform(void) +--- Python/getplatform.c ++++ Python/getplatform.c +@@ -10,3 +10,23 @@ { return PLATFORM; } @@ -210,11 +286,9 @@ +{ + return LIB; +} -Index: Python-2.7.1/Python/sysmodule.c -=================================================================== ---- Python-2.7.1.orig/Python/sysmodule.c -+++ Python-2.7.1/Python/sysmodule.c -@@ -1470,6 +1470,10 @@ _PySys_Init(void) +--- Python/sysmodule.c ++++ Python/sysmodule.c +@@ -1416,6 +1416,10 @@ PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyString_FromString(Py_GetPlatform())); @@ -225,66 +299,18 @@ SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: Python-2.7.1/configure.in -=================================================================== ---- Python-2.7.1.orig/configure.in -+++ Python-2.7.1/configure.in -@@ -636,6 +636,41 @@ SunOS*) - ;; - esac - -+AC_SUBST(ARCH) -+AC_MSG_CHECKING(ARCH) -+ARCH=`uname -m` -+case $ARCH in -+i?86) ARCH=i386;; -+esac -+AC_MSG_RESULT($ARCH) -+ -+AC_SUBST(LIB) -+AC_MSG_CHECKING(LIB) -+case $ac_sys_system in -+Linux*) -+ # Test if the compiler is 64bit -+ echo 'int i;' > conftest.$ac_ext -+ python_cv_cc_64bit_output=no -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *"ELF 64"*) -+ python_cv_cc_64bit_output=yes -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+esac -+ -+case $ARCH:$python_cv_cc_64bit_output in -+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) -+ LIB="lib64" -+ ;; -+*:*) -+ LIB="lib" -+ ;; -+esac -+AC_MSG_RESULT($LIB) - - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py -+++ Python-2.7.1/setup.py -@@ -347,7 +347,7 @@ class PyBuildExt(build_ext): +--- setup.py ++++ setup.py +@@ -369,7 +369,7 @@ def detect_modules(self): # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/' + sys.lib) add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() - # Add paths specified in the environment variables LDFLAGS and -@@ -404,8 +404,7 @@ class PyBuildExt(build_ext): +@@ -427,8 +427,7 @@ # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. lib_dirs = self.compiler.library_dirs + [ @@ -294,7 +320,7 @@ ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] -@@ -654,11 +653,11 @@ class PyBuildExt(build_ext): +@@ -677,11 +676,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -308,7 +334,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1730,18 +1729,17 @@ class PyBuildExt(build_ext): +@@ -1753,18 +1752,17 @@ # Check for various platform-specific directories if platform == 'sunos5': include_dirs.append('/usr/openwin/include') @@ -331,59 +357,3 @@ # If Cygwin, then verify that X is installed before proceeding if platform == 'cygwin': -Index: Python-2.7.1/Lib/test/test_site.py -=================================================================== ---- Python-2.7.1.orig/Lib/test/test_site.py -+++ Python-2.7.1/Lib/test/test_site.py -@@ -169,12 +169,16 @@ class HelperFunctionsTests(unittest.Test - wanted = os.path.join('xoxo', 'Lib', 'site-packages') - self.assertEqual(dirs[0], wanted) - elif os.sep == '/': -- self.assertEqual(len(dirs), 2) - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], - 'site-packages') -- self.assertEqual(dirs[0], wanted) -+ self.assertTrue(wanted in dirs) - wanted = os.path.join('xoxo', 'lib', 'site-python') -- self.assertEqual(dirs[1], wanted) -+ self.assertTrue(wanted in dirs) -+ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3], -+ 'site-packages') -+ self.assertTrue(wanted in dirs) -+ wanted = os.path.join('xoxo', sys.lib, 'site-python') -+ self.assertTrue(wanted in dirs) - else: - self.assertEqual(len(dirs), 2) - self.assertEqual(dirs[0], 'xoxo') -Index: Python-2.7.1/Lib/sysconfig.py -=================================================================== ---- Python-2.7.1.orig/Lib/sysconfig.py -+++ Python-2.7.1/Lib/sysconfig.py -@@ -7,10 +7,10 @@ from os.path import pardir, realpath - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -+ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', -+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', - 'include': '{base}/include/python{py_version_short}', - 'platinclude': '{platbase}/include/python{py_version_short}', - 'scripts': '{base}/bin', -@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { - 'data' : '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', -+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data' : '{userbase}', ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
