Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at 2014-02-26 06:55:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3 (Old) and /work/SRC/openSUSE:Factory/.python3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3" Changes: -------- --- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2013-12-10 09:08:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-base.changes 2014-02-26 06:55:28.000000000 +0100 @@ -1,0 +2,29 @@ +Fri Jan 17 18:45:27 UTC 2014 - [email protected] + +- initial commit of 3.4.0 beta 3 + * new stdlib modules: pathlib, enum, statistics, tracemalloc + * asynchronous IO with new asyncio module + * introspection data for builtins + * subprocesses no longer inherit open file descriptors + * standardized metadata for packages + * internal hashing changed to SipHash + * new pickle protocol + * improved handling of codecs + * TLS 1.2 support + * major speed improvements for internal unicode handling + * many bugfixes and optimizations +- see porting guide at: + http://docs.python.org/3.4/whatsnew/3.4.html#porting-to-python-3-4 +- moved several modules to -testsuite subpackage +- updated list of binary extensions, refreshed patches +- tracemalloc_gcov.patch fixes profile-based optimization build +- updated packages and pre_checkin.sh to use ~-version notation + for prereleases +- fix-shebangs part of build process moved to common %prep +- drop python-3.3.2-no-REUSEPORT.patch (upstreamed) +- update baselibs for new soname + +- TODOs: + * require python-pip, make ensurepip work with zypper + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3-doc.changes 2013-11-22 19:01:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-doc.changes 2014-02-26 06:55:28.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 21 18:09:54 UTC 2014 - [email protected] + +- initial commit of 3.4.0 beta2 + * for full changelog, see python3-base + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3.changes 2013-11-22 19:01:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3.new/python3.changes 2014-02-26 06:55:28.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 21 18:08:54 UTC 2014 - [email protected] + +- initial commit of 3.4.0 beta 3 + * for full changelog, see python3-base +- modify script shebangs in common %prep + +------------------------------------------------------------------- Old: ---- Python-3.3.3.tar.xz python-3.2b2-buildtime-generate.patch python-3.3.2-no-REUSEPORT.patch python-3.3.3-docs-html.tar.bz2 python-3.3.3-docs-pdf-a4.tar.bz2 python-3.3.3-docs-pdf-letter.tar.bz2 New: ---- Python-3.4.0b3.tar.xz python-3.4.0b2-docs-html.tar.bz2 python-3.4.0b2-docs-pdf-a4.tar.bz2 python-3.4.0b2-docs-pdf-letter.tar.bz2 tracemalloc_gcov.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-base.spec ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-base # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,9 +36,9 @@ Summary: Python3 Interpreter License: Python-2.0 Group: Development/Languages/Python -Version: 3.3.3 +Version: 3.4.0~b3 Release: 0 -%define tarversion %{version} +%define tarversion 3.4.0b3 %define tarname Python-%{tarversion} # python 3.1 didn't have a separate python-base, so it is wrongly @@ -46,7 +46,7 @@ Obsoletes: python3 < 3.2 # no Provides, because python3 is obviously provided by package python3 -Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz +Source0: http://www.python.org/ftp/python/3.4.0/%{tarname}.tar.xz Source1: baselibs.conf Source2: README.SUSE Source3: python3start @@ -77,12 +77,12 @@ Patch09: python-3.3.0b1-test-posix_fadvise.patch # Add missing bits for aarch64 in libffi Patch10: ctypes-libffi-aarch64.patch -# Disable SO_REUSEPORT constant in tests, because it's not supported on older kernels -Patch11: python-3.3.2-no-REUSEPORT.patch # Disable global and distutils sysconfig comparison test, we deviate from the default depending on optflags Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch # Add support for ppc64le (ELFv2) to libffi copy for ctypes Patch13: libffi-ppc64le.diff +# disable #pragma in tracemalloc that causes profile-opt to fail +Patch14: tracemalloc_gcov.patch ### COMMON-PATCH-END ### BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,10 +91,10 @@ # the versions are autogenerated from pre_checkin.sh # based on the current source tarball -%define python_version 3.3 +%define python_version 3.4 -%define python_version_abitag 33 -%define python_version_soname 3_3 +%define python_version_abitag 34 +%define python_version_soname 3_4 %define sitedir %{_libdir}/python%{python_version} @@ -210,13 +210,21 @@ %patch07 %patch09 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p0 +%patch14 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac +# fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3 +for dir in Lib Tools; do + # find *.py, filter to files that contain bad shebangs + find $dir -name '*.py' -type f -print0 \ + | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' \ + | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@' +done + ### COMMON-PREP-END ### %build @@ -228,6 +236,8 @@ autoreconf -fi # prevent make from trying to rebuild asdl stuff, which requires existing python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h +# prevent makeopcodetargets +touch -r Python/opcode_targets.h Lib/opcode.py Python/makeopcodetargets.py %if 0%{?sles_version} sed -e 's/-fprofile-correction//' -i Makefile.pre.in @@ -240,7 +250,8 @@ --docdir=%{_docdir}/python \ --enable-ipv6 \ --with-fpectl \ - --enable-shared + --enable-shared \ + --with-ensurepip=no LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ make %{?_smp_mflags} profile-opt @@ -280,11 +291,12 @@ if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : fi -make test TESTOPTS="-u -network,-gui $EXCLUDE" +make test TESTOPTS="-u none $EXCLUDE" # use network, be verbose: #make test TESTOPTS="-l -u network -v" %install + make \ OPT="%{optflags} -fPIC" \ DESTDIR=$RPM_BUILD_ROOT \ @@ -361,7 +373,7 @@ ln import_failed.py $module.py pushd __pycache__ for i in import_failed*; do - ln $i $module${i#import_failed} + ln $i "$module${i#import_failed}" done popd done @@ -369,12 +381,6 @@ ) echo %{sitedir}/_import_failed > $RPM_BUILD_ROOT/%{sitedir}/site-packages/zzzz-import-failed-hooks.pth -# fix shebangs -for dir in %{sitedir} %{_docdir}/%{name}; do - find $RPM_BUILD_ROOT/$dir -name '*.py' -type f -print0 \ - | xargs -0 sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@' -done - %clean rm -rf $RPM_BUILD_ROOT @@ -423,7 +429,9 @@ %{sitedir}/test %{sitedir}/*/test %{dynlib _ctypes_test} +%{dynlib _testbuffer} %{dynlib _testcapi} +%{dynlib _testimportmultiple} %{dynlib xxlimited} # workaround for missing packages %dir %{sitedir}/sqlite3 @@ -451,7 +459,6 @@ %dir %{sitedir}/lib-dynload #%{sitedir}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info %{dynlib array} -%{dynlib atexit} %{dynlib audioop} %{dynlib binascii} %{dynlib _bisect} @@ -481,6 +488,7 @@ %{dynlib _multiprocessing} %{dynlib nis} %{dynlib ossaudiodev} +%{dynlib _opcode} %{dynlib parser} %{dynlib _pickle} %{dynlib _posixsubprocess} @@ -493,7 +501,6 @@ %{dynlib syslog} %{dynlib termios} %{dynlib time} -%{dynlib _testbuffer} %{dynlib unicodedata} %{dynlib zlib} # hashlib fallback modules @@ -510,12 +517,14 @@ %dir %{sitedir}/site-packages/__pycache__ %exclude %{sitedir}/*/test %{sitedir}/*.py +%{sitedir}/asyncio %{sitedir}/ctypes %{sitedir}/collections %{sitedir}/concurrent %{sitedir}/distutils %{sitedir}/email %{sitedir}/encodings +%{sitedir}/ensurepip %{sitedir}/html %{sitedir}/http %{sitedir}/importlib ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,23 +23,23 @@ Summary: Additional Package Documentation for Python. License: Python-2.0 Group: Development/Languages/Python -Version: 3.3.3 +Version: 3.4.0~b2 Release: 0 BuildArch: noarch -%define tarversion %{version} +# we use "tarversion" for Python tarball, to be in sync with other specs... +%define tarversion 3.4.0b3 %define tarname Python-%{tarversion} -%define pyname python3 -%define pyver 3.3.3 -Enhances: %{pyname}=%{pyver} -Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz +# ...and "docversion" for version of doc tarballs, which can be lower +%define docversion 3.4.0b2 +Source0: http://www.python.org/ftp/python/3.4.0/%{tarname}.tar.xz # docs for current version are regenerated every day # this messes with autobuild "file changed" checks #Source1: http://docs.python.org/3/archives/python-%{version}-docs-html.tar.bz2 #Source2: http://docs.python.org/3/archives/python-%{version}-docs-pdf-a4.tar.bz2 #Source3: http://docs.python.org/3/archives/python-%{version}-docs-pdf-letter.tar.bz2 -Source1: python-%{version}-docs-html.tar.bz2 -Source2: python-%{version}-docs-pdf-a4.tar.bz2 -Source3: python-%{version}-docs-pdf-letter.tar.bz2 +Source1: python-%{docversion}-docs-html.tar.bz2 +Source2: python-%{docversion}-docs-pdf-a4.tar.bz2 +Source3: python-%{docversion}-docs-pdf-letter.tar.bz2 Provides: pyth_doc Provides: pyth_ps Obsoletes: pyth_doc @@ -64,21 +64,21 @@ Patch09: python-3.3.0b1-test-posix_fadvise.patch # Add missing bits for aarch64 in libffi Patch10: ctypes-libffi-aarch64.patch -# Disable SO_REUSEPORT constant in tests, because it's not supported on older kernels -Patch11: python-3.3.2-no-REUSEPORT.patch # Disable global and distutils sysconfig comparison test, we deviate from the default depending on optflags Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch # Add support for ppc64le (ELFv2) to libffi copy for ctypes Patch13: libffi-ppc64le.diff +# disable #pragma in tracemalloc that causes profile-opt to fail +Patch14: tracemalloc_gcov.patch ### COMMON-PATCH-END ### ### COMMON-DEF-BEGIN ### # the versions are autogenerated from pre_checkin.sh # based on the current source tarball -%define python_version 3.3 +%define python_version 3.4 -%define python_version_abitag 33 -%define python_version_soname 3_3 +%define python_version_abitag 34 +%define python_version_soname 3_4 %define sitedir %{_libdir}/python%{python_version} @@ -95,6 +95,8 @@ %define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}.so ### COMMON-DEF-END ### +Enhances: python3 = %{python_version} + %description Tutorial, Global Module Index, Language Reference, Library Reference, Extending and Embedding Reference, Python/C API Reference, Documenting @@ -134,24 +136,32 @@ %patch07 %patch09 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p0 +%patch14 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac +# fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3 +for dir in Lib Tools; do + # find *.py, filter to files that contain bad shebangs + find $dir -name '*.py' -type f -print0 \ + | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' \ + | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@' +done + ### COMMON-PREP-END ### %build # nothing to do (...whistles innocently) %install -export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{pyname} +export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/python3 install -d -m 755 $PDOCS/Misc install -d -m 755 $PDOCS/paper-a4 $PDOCS/paper-letter $PDOCS/html tar xfj %{S:1} -C $PDOCS/html -( cd $PDOCS/html; mv python-%{version}-docs-html/* . ; rm -rf python-%{version}-docs-html) +( cd $PDOCS/html; mv python-%{docversion}-docs-html/* . ; rm -rf python-%{docversion}-docs-html) tar xfj %{S:2} -C $PDOCS/paper-a4 ( cd $PDOCS/paper-a4; mv docs-pdf/* . ; rm -rf docs-pdf) tar xfj %{S:3} -C $PDOCS/paper-letter @@ -166,14 +176,14 @@ %files %defattr(644, root, root, 755) -%dir %{_docdir}/%{pyname} -%doc %{_docdir}/%{pyname}/Misc -%doc %{_docdir}/%{pyname}/html -%doc %{_docdir}/%{pyname}/ACKS.txt +%dir %{_docdir}/python3 +%doc %{_docdir}/python3/Misc +%doc %{_docdir}/python3/html +%doc %{_docdir}/python3/ACKS.txt %files pdf %defattr(644, root, root, 755) -%doc %{_docdir}/%{pyname}/paper-a4 -%doc %{_docdir}/%{pyname}/paper-letter +%doc %{_docdir}/python3/paper-a4 +%doc %{_docdir}/python3/paper-letter %changelog ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,14 +40,14 @@ Summary: Python3 Interpreter License: Python-2.0 Group: Development/Languages/Python -Version: 3.3.3 +Version: 3.4.0~b3 Release: 0 -%define tarversion %{version} +%define tarversion 3.4.0b3 %define tarname Python-%{tarversion} Requires: python3-base = %{version} -Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz +Source0: http://www.python.org/ftp/python/3.4.0/%{tarname}.tar.xz Source1: baselibs.conf #Source11: testfiles.tar.bz2 # issues with copyrighted Unicode testing files @@ -75,12 +75,12 @@ Patch09: python-3.3.0b1-test-posix_fadvise.patch # Add missing bits for aarch64 in libffi Patch10: ctypes-libffi-aarch64.patch -# Disable SO_REUSEPORT constant in tests, because it's not supported on older kernels -Patch11: python-3.3.2-no-REUSEPORT.patch # Disable global and distutils sysconfig comparison test, we deviate from the default depending on optflags Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch # Add support for ppc64le (ELFv2) to libffi copy for ctypes Patch13: libffi-ppc64le.diff +# disable #pragma in tracemalloc that causes profile-opt to fail +Patch14: tracemalloc_gcov.patch ### COMMON-PATCH-END ### BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,10 +94,10 @@ # the versions are autogenerated from pre_checkin.sh # based on the current source tarball -%define python_version 3.3 +%define python_version 3.4 -%define python_version_abitag 33 -%define python_version_soname 3_3 +%define python_version_abitag 34 +%define python_version_soname 3_4 %define sitedir %{_libdir}/python%{python_version} @@ -180,13 +180,21 @@ %patch07 %patch09 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p0 +%patch14 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac +# fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3 +for dir in Lib Tools; do + # find *.py, filter to files that contain bad shebangs + find $dir -name '*.py' -type f -print0 \ + | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' \ + | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@' +done + ### COMMON-PREP-END ### %build @@ -207,7 +215,8 @@ --with-fpectl \ --enable-shared \ --with-system-ffi \ - --with-system-expat + --with-system-expat \ + --with-ensurepip=no make %{?_smp_mflags} # DESTDIR=$RPM_BUILD_ROOT @@ -218,7 +227,7 @@ fi # only test the parts skipped in python3-base TESTS="test_dbm_gnu test_dbm_ndbm test_readline test_ssl test_tcl test_tk test_ttk_guionly test_ttk_textonly test_curses test_socketserver test_sqlite test_hashlib test_smtpnet" -make test TESTOPTS="-u -network,-gui $TESTS" +make test TESTOPTS="-u none $TESTS" %install make \ @@ -241,7 +250,8 @@ rm $RPM_BUILD_ROOT%{sitedir}/*.* for module in \ - ctypes collections concurrent distutils email encodings html http \ + asyncio ctypes collections concurrent distutils email encodings ensurepip \ + html http \ importlib json logging multiprocessing plat-* pydoc_data unittest \ urllib venv wsgiref lib2to3 test idlelib turtledemo do @@ -249,21 +259,17 @@ done for library in \ - array atexit audioop binascii _bisect _bz2 cmath _codecs_* _crypt _csv \ + array audioop binascii _bisect _bz2 cmath _codecs_* _crypt _csv \ _ctypes _datetime _decimal _elementtree fcntl grp _heapq _json _lsprof \ - _lzma \ - math mmap _multibytecodec _multiprocessing nis ossaudiodev parser _pickle \ - _posixsubprocess _random resource select _socket spwd _struct syslog \ - termios _testbuffer time unicodedata zlib _ctypes_test _testcapi xxlimited \ + _lzma math mmap _multibytecodec _multiprocessing nis _opcode ossaudiodev \ + parser _pickle _posixsubprocess _random resource select _socket spwd \ + _struct syslog termios _testbuffer _testimportmultiple time unicodedata zlib \ + _ctypes_test _testcapi xxlimited \ _md5 _sha1 _sha256 _sha512 do eval rm "$RPM_BUILD_ROOT%{sitedir}/lib-dynload/$library.*" done -# fix shebangs -find $RPM_BUILD_ROOT%{sitedir} -name '*.py' -type f -print0 \ - | xargs -0 sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!/usr/bin/python3@' - %fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} %files tk ++++++ Python-3.3.0b2-multilib.patch ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,8 +1,8 @@ -Index: Python-3.3.1/Include/pythonrun.h +Index: Python-3.4.0b3/Include/pythonrun.h =================================================================== ---- Python-3.3.1.orig/Include/pythonrun.h -+++ Python-3.3.1/Include/pythonrun.h -@@ -181,6 +181,8 @@ int _Py_CheckPython3(); +--- Python-3.4.0b3.orig/Include/pythonrun.h 2014-01-27 05:13:48.000000000 +0100 ++++ Python-3.4.0b3/Include/pythonrun.h 2014-02-04 17:18:37.567144169 +0100 +@@ -220,6 +220,8 @@ /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); @@ -11,11 +11,11 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-3.3.1/Lib/distutils/command/install.py +Index: Python-3.4.0b3/Lib/distutils/command/install.py =================================================================== ---- Python-3.3.1.orig/Lib/distutils/command/install.py -+++ Python-3.3.1/Lib/distutils/command/install.py -@@ -25,6 +25,8 @@ else: +--- Python-3.4.0b3.orig/Lib/distutils/command/install.py 2014-02-04 17:18:32.199117143 +0100 ++++ Python-3.4.0b3/Lib/distutils/command/install.py 2014-02-04 17:18:37.568144174 +0100 +@@ -25,6 +25,8 @@ from site import USER_SITE HAS_USER_SITE = True @@ -24,7 +24,7 @@ if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', -@@ -45,7 +47,7 @@ else: +@@ -45,7 +47,7 @@ INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', @@ -33,11 +33,11 @@ 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-3.3.1/Lib/distutils/sysconfig.py +Index: Python-3.4.0b3/Lib/distutils/sysconfig.py =================================================================== ---- Python-3.3.1.orig/Lib/distutils/sysconfig.py -+++ Python-3.3.1/Lib/distutils/sysconfig.py -@@ -143,8 +143,11 @@ def get_python_lib(plat_specific=0, stan +--- Python-3.4.0b3.orig/Lib/distutils/sysconfig.py 2014-01-27 05:13:48.000000000 +0100 ++++ Python-3.4.0b3/Lib/distutils/sysconfig.py 2014-02-04 17:18:37.568144174 +0100 +@@ -141,8 +141,11 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -51,11 +51,11 @@ if standard_lib: return libpython else: -Index: Python-3.3.1/Lib/pydoc.py +Index: Python-3.4.0b3/Lib/pydoc.py =================================================================== ---- Python-3.3.1.orig/Lib/pydoc.py -+++ Python-3.3.1/Lib/pydoc.py -@@ -372,7 +372,7 @@ class Doc: +--- Python-3.4.0b3.orig/Lib/pydoc.py 2014-01-27 05:13:49.000000000 +0100 ++++ Python-3.4.0b3/Lib/pydoc.py 2014-02-04 17:18:37.568144174 +0100 +@@ -379,7 +379,7 @@ docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) @@ -64,14 +64,14 @@ "python%d.%d" % sys.version_info[:2]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-3.3.1/Lib/site.py +Index: Python-3.4.0b3/Lib/site.py =================================================================== ---- Python-3.3.1.orig/Lib/site.py -+++ Python-3.3.1/Lib/site.py -@@ -303,13 +303,19 @@ def getsitepackages(prefixes=None): - if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': +--- Python-3.4.0b3.orig/Lib/site.py 2014-01-27 05:13:49.000000000 +0100 ++++ Python-3.4.0b3/Lib/site.py 2014-02-04 17:18:37.568144174 +0100 +@@ -304,13 +304,19 @@ + seen.add(prefix) + + if os.sep == '/': - sitepackages.append(os.path.join(prefix, "lib", + sitepackages.append(os.path.join(prefix, sys.lib, "python" + sys.version[:3], @@ -91,11 +91,11 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-3.3.1/Lib/trace.py +Index: Python-3.4.0b3/Lib/trace.py =================================================================== ---- Python-3.3.1.orig/Lib/trace.py -+++ Python-3.3.1/Lib/trace.py -@@ -751,10 +751,10 @@ def main(argv=None): +--- Python-3.4.0b3.orig/Lib/trace.py 2014-01-27 05:13:50.000000000 +0100 ++++ Python-3.4.0b3/Lib/trace.py 2014-02-04 17:18:37.569144179 +0100 +@@ -751,10 +751,10 @@ # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -108,11 +108,11 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-3.3.1/Makefile.pre.in +Index: Python-3.4.0b3/Makefile.pre.in =================================================================== ---- Python-3.3.1.orig/Makefile.pre.in -+++ Python-3.3.1/Makefile.pre.in -@@ -96,6 +96,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLA +--- Python-3.4.0b3.orig/Makefile.pre.in 2014-01-27 05:13:50.000000000 +0100 ++++ Python-3.4.0b3/Makefile.pre.in 2014-02-04 17:18:37.569144179 +0100 +@@ -96,6 +96,8 @@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -121,7 +121,7 @@ # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -115,7 +117,7 @@ LIBDIR= @libdir@ +@@ -115,7 +117,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -130,7 +130,7 @@ ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -633,6 +635,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -695,6 +697,7 @@ -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -138,7 +138,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -699,7 +702,7 @@ $(AST_C): $(AST_H) $(AST_ASDL) $(ASDLGEN +@@ -763,7 +766,7 @@ Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -147,11 +147,11 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-3.3.1/Modules/getpath.c +Index: Python-3.4.0b3/Modules/getpath.c =================================================================== ---- Python-3.3.1.orig/Modules/getpath.c -+++ Python-3.3.1/Modules/getpath.c -@@ -121,9 +121,11 @@ +--- Python-3.4.0b3.orig/Modules/getpath.c 2014-01-27 05:13:50.000000000 +0100 ++++ Python-3.4.0b3/Modules/getpath.c 2014-02-04 17:19:38.126449128 +0100 +@@ -117,9 +117,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -165,20 +165,20 @@ #endif #ifndef LANDMARK -@@ -135,7 +137,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1] - static wchar_t progpath[MAXPATHLEN+1]; - static wchar_t *module_search_path = NULL; - static int module_search_path_malloced = 0; --static wchar_t *lib_python = L"lib/python" VERSION; -+static wchar_t *lib_python = L"" LIB_PYTHON; - - static void - reduce(wchar_t *dir) -Index: Python-3.3.1/Python/getplatform.c -=================================================================== ---- Python-3.3.1.orig/Python/getplatform.c -+++ Python-3.3.1/Python/getplatform.c -@@ -10,3 +10,23 @@ Py_GetPlatform(void) +@@ -494,7 +496,7 @@ + _pythonpath = _Py_char2wchar(PYTHONPATH, NULL); + _prefix = _Py_char2wchar(PREFIX, NULL); + _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL); +- lib_python = _Py_char2wchar("lib/python" VERSION, NULL); ++ lib_python = _Py_char2wchar(LIB_PYTHON, NULL); + + if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { + Py_FatalError( +Index: Python-3.4.0b3/Python/getplatform.c +=================================================================== +--- Python-3.4.0b3.orig/Python/getplatform.c 2014-01-27 05:13:51.000000000 +0100 ++++ Python-3.4.0b3/Python/getplatform.c 2014-02-04 17:18:37.569144179 +0100 +@@ -10,3 +10,23 @@ { return PLATFORM; } @@ -202,11 +202,11 @@ +{ + return LIB; +} -Index: Python-3.3.1/Python/sysmodule.c +Index: Python-3.4.0b3/Python/sysmodule.c =================================================================== ---- Python-3.3.1.orig/Python/sysmodule.c -+++ Python-3.3.1/Python/sysmodule.c -@@ -1612,6 +1612,10 @@ _PySys_Init(void) +--- Python-3.4.0b3.orig/Python/sysmodule.c 2014-01-27 05:13:51.000000000 +0100 ++++ Python-3.4.0b3/Python/sysmodule.c 2014-02-04 17:18:37.569144179 +0100 +@@ -1691,6 +1691,10 @@ PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); @@ -217,11 +217,11 @@ SET_SYS_FROM_STRING("executable", PyUnicode_FromWideChar( Py_GetProgramFullPath(), -1)); -Index: Python-3.3.1/setup.py +Index: Python-3.4.0b3/setup.py =================================================================== ---- Python-3.3.1.orig/setup.py -+++ Python-3.3.1/setup.py -@@ -439,7 +439,7 @@ class PyBuildExt(build_ext): +--- Python-3.4.0b3.orig/setup.py 2014-01-27 05:13:51.000000000 +0100 ++++ Python-3.4.0b3/setup.py 2014-02-04 17:18:37.570144184 +0100 +@@ -445,7 +445,7 @@ # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -230,7 +230,7 @@ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: -@@ -496,8 +496,7 @@ class PyBuildExt(build_ext): +@@ -502,8 +502,7 @@ # be assumed that no additional -I,-L directives are needed. if not cross_compiling: lib_dirs = self.compiler.library_dirs + [ @@ -240,7 +240,7 @@ ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] else: -@@ -712,11 +711,11 @@ class PyBuildExt(build_ext): +@@ -722,11 +721,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -254,7 +254,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1674,18 +1673,17 @@ class PyBuildExt(build_ext): +@@ -1732,18 +1731,17 @@ # Check for various platform-specific directories if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include') @@ -277,11 +277,11 @@ # If Cygwin, then verify that X is installed before proceeding if host_platform == 'cygwin': -Index: Python-3.3.1/Lib/sysconfig.py +Index: Python-3.4.0b3/Lib/sysconfig.py =================================================================== ---- Python-3.3.1.orig/Lib/sysconfig.py -+++ Python-3.3.1/Lib/sysconfig.py -@@ -21,10 +21,10 @@ __all__ = [ +--- Python-3.4.0b3.orig/Lib/sysconfig.py 2014-01-27 05:13:49.000000000 +0100 ++++ Python-3.4.0b3/Lib/sysconfig.py 2014-02-04 17:18:37.570144184 +0100 +@@ -20,10 +20,10 @@ _INSTALL_SCHEMES = { 'posix_prefix': { @@ -295,7 +295,7 @@ 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': -@@ -33,10 +33,10 @@ _INSTALL_SCHEMES = { +@@ -32,10 +32,10 @@ 'data': '{base}', }, 'posix_home': { @@ -309,7 +309,7 @@ 'include': '{installed_base}/include/python', 'platinclude': '{installed_base}/include/python', 'scripts': '{base}/bin', -@@ -81,10 +81,10 @@ _INSTALL_SCHEMES = { +@@ -61,10 +61,10 @@ 'data': '{userbase}', }, 'posix_user': { @@ -323,11 +323,11 @@ 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', -Index: Python-3.3.1/configure.ac +Index: Python-3.4.0b3/configure.ac =================================================================== ---- Python-3.3.1.orig/configure.ac -+++ Python-3.3.1/configure.ac -@@ -769,6 +769,41 @@ esac +--- Python-3.4.0b3.orig/configure.ac 2014-01-27 05:13:51.000000000 +0100 ++++ Python-3.4.0b3/configure.ac 2014-02-04 17:18:37.571144189 +0100 +@@ -788,6 +788,41 @@ MULTIARCH=$($CC --print-multiarch 2>/dev/null) AC_SUBST(MULTIARCH) ++++++ Python-3.3.3.tar.xz -> Python-3.4.0b3.tar.xz ++++++ /work/SRC/openSUSE:Factory/python3/Python-3.3.3.tar.xz /work/SRC/openSUSE:Factory/.python3.new/Python-3.4.0b3.tar.xz differ: char 25, line 1 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,3 +1,3 @@ python3 python3-base -libpython3_3m1_0 +libpython3_4m1_0 ++++++ import_failed.map ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,6 +1,6 @@ python3-tools: turtledemo python3-idle: idlelib -python3-testsuite: test _ctypes_test _testcapi xxlimited +python3-testsuite: test _ctypes_test _testbuffer _testcapi _testimportmultiple xxlimited python3-tk: tkinter _tkinter python3-curses: curses _curses _curses_panel python3-dbm: dbm _dbm _gdbm ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -17,7 +17,7 @@ # VERSION = 3.3.0 Version=${VERSION/[a-z]*/} # 3.3.0 -tar_suffix=${VERSION#$Version} # b3 +tar_suffix=${VERSION#$Version} # b1 a_version=(${Version//\./ }) # 3 3 0 python_version=${VERSION:0:3} # 3.3 @@ -25,36 +25,27 @@ python_version_soname=${python_version//./_} # 3_3 if [ -n "$tar_suffix" ]; then - # we want to generate: - # 3.2.3 -> 3.2.2.99 - # 3.3.0 -> 3.2.99 - (( last_elem = ${#a_version[@]} - 1 )) - if [ ${a_version[$last_elem]} -eq 0 ]; then - unset a_version[$last_elem] - (( last_elem-- )) - fi - # this will fail when python 4.0 comes out. mwahaha - (( a_version[$last_elem]-- )) - Version=${a_version[*]} - Version=${Version// /.}.99$tar_suffix # 3.2.99b1 - + Version=$Version~$tar_suffix # 3.3.0~b1 tarversion=$VERSION # 3.3.0b1 else tarversion="%{version}" fi +# set Version for python3 and python3-base (-doc has separate version) sed -i -r 's/(^Version:[ \t]+).*/\1'"$Version"'/' python3{-base,}.spec +# set tarversion for every spec sed -i -r 's/(^%define[ \t]+tarversion[ \t]+).*/\1'$tarversion'/' python3*.spec -#sed -i -r 's/(^Version:[ \t]+).*/\1'"$python_version"'/' python3-doc.spec -sed -i -r 's/(^%define[ \t]+pyver[ \t]+).*/\1'$Version'/' python3-doc.spec - for varname in python_version{,_abitag,_soname}; do eval varvalue=\$$varname sed -i -r 's/(^%define[ \t]+'$varname'[ \t]+).*/\1'$varvalue'/' $master done +# update baselibs +sed -i -r 's/^libpython.*$/libpython'$python_version_soname'm1_0/' baselibs.conf + + # copy definition sections ++++++ python-3.3.0b1-localpath.patch ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,9 +1,9 @@ Index: Lib/site.py =================================================================== ---- Lib/site.py.orig 2012-08-07 13:44:51.000000000 +0200 -+++ Lib/site.py 2012-08-07 13:44:52.000000000 +0200 -@@ -71,7 +71,7 @@ - import builtins +--- Lib/site.py.orig 2013-12-20 12:06:39.163304471 +0100 ++++ Lib/site.py 2013-12-20 12:06:39.171304514 +0100 +@@ -74,7 +74,7 @@ + import _sitebuiltins # Prefixes for site-packages; add additional prefixes like /usr/local here -PREFIXES = [sys.prefix, sys.exec_prefix] @@ -13,9 +13,9 @@ ENABLE_USER_SITE = None Index: Lib/test/test_site.py =================================================================== ---- Lib/test/test_site.py.orig 2012-06-26 22:19:48.000000000 +0200 -+++ Lib/test/test_site.py 2012-08-07 13:44:52.000000000 +0200 -@@ -239,12 +239,27 @@ +--- Lib/test/test_site.py.orig 2013-11-24 21:36:55.000000000 +0100 ++++ Lib/test/test_site.py 2013-12-20 12:06:39.171304514 +0100 +@@ -244,12 +244,27 @@ self.assertEqual(dirs[2], wanted) elif os.sep == '/': # OS X non-framwework builds, Linux, FreeBSD, etc ++++++ python-3.3.3-skip-distutils-test_sysconfig_module.patch ++++++ --- /var/tmp/diff_new_pack.rPphxy/_old 2014-02-26 06:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.rPphxy/_new 2014-02-26 06:55:30.000000000 +0100 @@ -1,11 +1,12 @@ -diff -ruN a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py ---- a/Lib/distutils/tests/test_sysconfig.py 2013-11-17 08:22:31.000000000 +0100 -+++ b/Lib/distutils/tests/test_sysconfig.py 2013-11-22 14:05:40.718570645 +0100 -@@ -127,6 +127,7 @@ +Index: Python-3.4.0b1/Lib/distutils/tests/test_sysconfig.py +=================================================================== +--- Python-3.4.0b1.orig/Lib/distutils/tests/test_sysconfig.py 2013-11-24 21:36:54.000000000 +0100 ++++ Python-3.4.0b1/Lib/distutils/tests/test_sysconfig.py 2013-12-20 12:09:13.307133040 +0100 +@@ -125,6 +125,7 @@ 'OTHER': 'foo'}) + @unittest.skip("Either fix distutil's sysconfig everytime we add new compiler flags or we just skip this test") def test_sysconfig_module(self): import sysconfig as global_sysconfig - self.assertEqual(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS')) + self.assertEqual(global_sysconfig.get_config_var('CFLAGS'), ++++++ python-3.3.3-docs-html.tar.bz2 -> python-3.4.0b2-docs-html.tar.bz2 ++++++ ++++ 277174 lines of diff (skipped) ++++++ python-3.3.3-docs-pdf-a4.tar.bz2 -> python-3.4.0b2-docs-pdf-a4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python3/python-3.3.3-docs-pdf-a4.tar.bz2 /work/SRC/openSUSE:Factory/.python3.new/python-3.4.0b2-docs-pdf-a4.tar.bz2 differ: char 11, line 1 ++++++ python-3.3.3-docs-pdf-letter.tar.bz2 -> python-3.4.0b2-docs-pdf-letter.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python3/python-3.3.3-docs-pdf-letter.tar.bz2 /work/SRC/openSUSE:Factory/.python3.new/python-3.4.0b2-docs-pdf-letter.tar.bz2 differ: char 11, line 1 ++++++ tracemalloc_gcov.patch ++++++ diff -r 9a98ff4a2290 Modules/_tracemalloc.c --- a/Modules/_tracemalloc.c Wed Jan 22 05:49:11 2014 -0800 +++ b/Modules/_tracemalloc.c Thu Jan 23 00:17:44 2014 +0100 @@ -61,7 +61,9 @@ static PyThread_type_lock tables_lock; architectures: 12 bytes instead of 16. This optimization might produce SIGBUS on architectures not supporting unaligned memory accesses (64-bit IPS CPU?): on such architecture, the structure must not be packed. */ -#pragma pack(4) +#ifdef _MSC_VER +# pragma pack(4) +#endif typedef struct #ifdef __GNUC__ __attribute__((packed)) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
