Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at Sat Jan 15 02:57:31 CET 2011. -------- --- python3/python3-doc.changes 2009-08-06 20:49:14.000000000 +0200 +++ python3/python3-doc.changes 2010-11-29 15:25:09.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 29 14:24:43 UTC 2010 - jmatejek@novell.com + +- updated to build against 3.1.2 + +------------------------------------------------------------------- --- python3/python3.changes 2010-11-15 14:12:50.000000000 +0100 +++ python3/python3.changes 2011-01-14 21:21:26.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 14 19:51:51 UTC 2011 - coolo@novell.com + +- update to 3.1.3 + * tons of bug fixes from 3.1 branch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:download_url:Python-3.1.2.tar.bz2 rev79851.diff New: ---- _service:download_url:Python-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.6A79XM/_old 2011-01-15 02:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6A79XM/_new 2011-01-15 02:57:04.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python3-doc (Version 3.1) +# spec file for package python3-doc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,8 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 3.1 -Release: 11 -%define pyver 3.1 +Release: 12 +%define pyver 3.1.3 BuildArch: noarch %define tarname Python-%{pyver} %define pyname python ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.6A79XM/_old 2011-01-15 02:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6A79XM/_new 2011-01-15 02:57:04.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python3 (Version 3.1.2) +# spec file for package python3 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -25,7 +25,7 @@ Group: Development/Languages/Python AutoReqProv: on Summary: Python3 Interpreter -Version: 3.1.2 +Version: 3.1.3 Release: 1 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 @@ -50,8 +50,6 @@ Patch34: python-2.5.2-docdirs.patch Patch35: python-2.5.2-configure.patch Patch36: python-2.6b3-curses-panel.patch -# PATCH-UPSTREAM fix zlib test case (r79851) -Patch37: rev79851.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) %define idle_name idle3 @@ -221,7 +219,6 @@ %if %suse_version > 1100 %patch36 %endif -%patch37 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f find . -name CVS -type d -print0 | xargs -0 rm -rf ++++++ Python-2.3.3-dirs.patch ++++++ --- /var/tmp/diff_new_pack.6A79XM/_old 2011-01-15 02:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6A79XM/_new 2011-01-15 02:57:04.000000000 +0100 @@ -2,22 +2,17 @@ Index: Makefile.pre.in =================================================================== ---- Makefile.pre.in.orig -+++ Makefile.pre.in -@@ -89,12 +89,12 @@ exec_prefix= @exec_prefix@ - datarootdir= @datarootdir@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ +--- Makefile.pre.in.orig 2010-10-14 13:35:17.000000000 +0200 ++++ Makefile.pre.in 2011-01-14 20:57:28.745314227 +0100 +@@ -93,8 +93,9 @@ BINDIR= @bindir@ + LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ -CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib -+CONFINCLUDEDIR= @includedir@ -+SCRIPTDIR= @libdir@ ++CONFINCLUDEDIR= @includedir@ ++SCRIPTDIR= @libdir@ ++ # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) ++++++ Python-3.1-multilib.patch ++++++ --- /var/tmp/diff_new_pack.6A79XM/_old 2011-01-15 02:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6A79XM/_new 2011-01-15 02:57:04.000000000 +0100 @@ -1,8 +1,8 @@ -Index: Python-3.1/Include/pythonrun.h +Index: Python-3.1.3/Include/pythonrun.h =================================================================== ---- Python-3.1.orig/Include/pythonrun.h -+++ Python-3.1/Include/pythonrun.h -@@ -112,6 +112,8 @@ PyAPI_FUNC(wchar_t *) Py_GetPath(void); +--- Python-3.1.3.orig/Include/pythonrun.h 2010-05-09 18:14:21.000000000 +0200 ++++ Python-3.1.3/Include/pythonrun.h 2011-01-14 20:58:47.271439689 +0100 +@@ -114,6 +114,8 @@ PyAPI_FUNC(wchar_t *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); @@ -11,10 +11,10 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-3.1/Lib/distutils/command/install.py +Index: Python-3.1.3/Lib/distutils/command/install.py =================================================================== ---- Python-3.1.orig/Lib/distutils/command/install.py -+++ Python-3.1/Lib/distutils/command/install.py +--- Python-3.1.3.orig/Lib/distutils/command/install.py 2011-01-14 20:58:25.000000000 +0100 ++++ Python-3.1.3/Lib/distutils/command/install.py 2011-01-14 20:58:47.272439342 +0100 @@ -27,6 +27,8 @@ else: from site import USER_SITE HAS_USER_SITE = True @@ -41,10 +41,10 @@ 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-3.1/Lib/distutils/sysconfig.py +Index: Python-3.1.3/Lib/distutils/sysconfig.py =================================================================== ---- Python-3.1.orig/Lib/distutils/sysconfig.py -+++ Python-3.1/Lib/distutils/sysconfig.py +--- Python-3.1.3.orig/Lib/distutils/sysconfig.py 2010-08-03 23:33:04.000000000 +0200 ++++ Python-3.1.3/Lib/distutils/sysconfig.py 2011-01-14 20:58:47.272439342 +0100 @@ -117,8 +117,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -59,24 +59,24 @@ if standard_lib: return libpython else: -Index: Python-3.1/Lib/pydoc.py +Index: Python-3.1.3/Lib/pydoc.py =================================================================== ---- Python-3.1.orig/Lib/pydoc.py -+++ Python-3.1/Lib/pydoc.py -@@ -343,7 +343,7 @@ class Doc: +--- Python-3.1.3.orig/Lib/pydoc.py 2010-11-18 02:58:16.000000000 +0100 ++++ Python-3.1.3/Lib/pydoc.py 2011-01-14 20:59:16.693483189 +0100 +@@ -341,7 +341,7 @@ class Doc: + + docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) - docloc = os.environ.get("PYTHONDOCS", - "http://docs.python.org/library") - basedir = os.path.join(sys.exec_prefix, "lib", + basedir = os.path.join(sys.exec_prefix, sys.lib, - "python"+sys.version[0:3]) + "python%d.%d" % sys.version_info[:2]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-3.1/Lib/site.py +Index: Python-3.1.3/Lib/site.py =================================================================== ---- Python-3.1.orig/Lib/site.py -+++ Python-3.1/Lib/site.py -@@ -258,13 +258,19 @@ def addsitepackages(known_paths): +--- Python-3.1.3.orig/Lib/site.py 2010-10-13 00:56:55.000000000 +0200 ++++ Python-3.1.3/Lib/site.py 2011-01-14 20:58:47.274439288 +0100 +@@ -262,13 +262,19 @@ def addsitepackages(known_paths): if sys.platform in ('os2emx', 'riscos'): sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -99,11 +99,11 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple -Index: Python-3.1/Lib/trace.py +Index: Python-3.1.3/Lib/trace.py =================================================================== ---- Python-3.1.orig/Lib/trace.py -+++ Python-3.1/Lib/trace.py -@@ -755,10 +755,10 @@ def main(argv=None): +--- Python-3.1.3.orig/Lib/trace.py 2010-11-06 02:35:01.000000000 +0100 ++++ Python-3.1.3/Lib/trace.py 2011-01-14 20:58:47.274439288 +0100 +@@ -761,10 +761,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -116,10 +116,10 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-3.1/Makefile.pre.in +Index: Python-3.1.3/Makefile.pre.in =================================================================== ---- Python-3.1.orig/Makefile.pre.in -+++ Python-3.1/Makefile.pre.in +--- Python-3.1.3.orig/Makefile.pre.in 2011-01-14 20:58:25.000000000 +0100 ++++ Python-3.1.3/Makefile.pre.in 2011-01-14 20:58:47.275439241 +0100 @@ -78,6 +78,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories @@ -129,7 +129,7 @@ # Install prefix for architecture-independent files prefix= @prefix@ -@@ -533,6 +535,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -534,6 +536,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -137,7 +137,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -565,7 +568,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) +@@ -566,7 +569,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -146,11 +146,11 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-3.1/Modules/getpath.c +Index: Python-3.1.3/Modules/getpath.c =================================================================== ---- Python-3.1.orig/Modules/getpath.c -+++ Python-3.1/Modules/getpath.c -@@ -116,9 +116,11 @@ +--- Python-3.1.3.orig/Modules/getpath.c 2010-10-08 01:39:04.000000000 +0200 ++++ Python-3.1.3/Modules/getpath.c 2011-01-14 20:58:47.275439241 +0100 +@@ -118,9 +118,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -164,7 +164,7 @@ #endif #ifndef LANDMARK -@@ -129,7 +131,7 @@ static wchar_t prefix[MAXPATHLEN+1]; +@@ -131,7 +133,7 @@ static wchar_t prefix[MAXPATHLEN+1]; static wchar_t exec_prefix[MAXPATHLEN+1]; static wchar_t progpath[MAXPATHLEN+1]; static wchar_t *module_search_path = NULL; @@ -173,10 +173,10 @@ /* In principle, this should use HAVE__WSTAT, and _wstat should be detected by autoconf. However, no current -Index: Python-3.1/Python/getplatform.c +Index: Python-3.1.3/Python/getplatform.c =================================================================== ---- Python-3.1.orig/Python/getplatform.c -+++ Python-3.1/Python/getplatform.c +--- Python-3.1.3.orig/Python/getplatform.c 2000-09-02 01:29:29.000000000 +0200 ++++ Python-3.1.3/Python/getplatform.c 2011-01-14 20:58:47.276439146 +0100 @@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; @@ -201,26 +201,26 @@ +{ + return LIB; +} -Index: Python-3.1/Python/sysmodule.c +Index: Python-3.1.3/Python/sysmodule.c =================================================================== ---- Python-3.1.orig/Python/sysmodule.c -+++ Python-3.1/Python/sysmodule.c -@@ -1364,6 +1364,10 @@ _PySys_Init(void) - PyUnicode_FromString(Py_GetCopyright())); - SET_SYS_FROM_STRING("platform", - PyUnicode_FromString(Py_GetPlatform())); +--- Python-3.1.3.orig/Python/sysmodule.c 2010-06-08 22:50:09.000000000 +0200 ++++ Python-3.1.3/Python/sysmodule.c 2011-01-14 21:00:08.730439224 +0100 +@@ -1366,6 +1366,10 @@ _PySys_Init(void) + PyUnicode_FromString(Py_GetCopyright())); + SET_SYS_FROM_STRING("platform", + PyUnicode_FromString(Py_GetPlatform())); + SET_SYS_FROM_STRING("arch", -+ PyUnicode_FromString(Py_GetArch())); ++ PyUnicode_FromString(Py_GetArch())); + SET_SYS_FROM_STRING("lib", -+ PyUnicode_FromString(Py_GetLib())); - SET_SYS_FROM_STRING("executable", - PyUnicode_FromWideChar( - Py_GetProgramFullPath(), -1)); -Index: Python-3.1/configure.in -=================================================================== ---- Python-3.1.orig/configure.in -+++ Python-3.1/configure.in -@@ -542,6 +542,41 @@ SunOS*) ++ PyUnicode_FromString(Py_GetLib())); + SET_SYS_FROM_STRING("executable", + PyUnicode_FromWideChar( + Py_GetProgramFullPath(), -1)); +Index: Python-3.1.3/configure.in +=================================================================== +--- Python-3.1.3.orig/configure.in 2010-11-25 18:05:57.000000000 +0100 ++++ Python-3.1.3/configure.in 2011-01-14 20:58:47.278439485 +0100 +@@ -564,6 +564,41 @@ SunOS*) ;; esac @@ -262,11 +262,11 @@ AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -Index: Python-3.1/setup.py +Index: Python-3.1.3/setup.py =================================================================== ---- Python-3.1.orig/setup.py -+++ Python-3.1/setup.py -@@ -295,7 +295,7 @@ class PyBuildExt(build_ext): +--- Python-3.1.3.orig/setup.py 2010-11-26 12:56:26.000000000 +0100 ++++ Python-3.1.3/setup.py 2011-01-14 20:58:47.309324491 +0100 +@@ -341,7 +341,7 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used @@ -275,7 +275,7 @@ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # Add paths specified in the environment variables LDFLAGS and -@@ -342,8 +342,7 @@ class PyBuildExt(build_ext): +@@ -393,8 +393,7 @@ class PyBuildExt(build_ext): # 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 + [ @@ -285,9 +285,9 @@ ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] -@@ -522,11 +521,11 @@ class PyBuildExt(build_ext): - elif self.compiler.find_library_file(lib_dirs, 'curses'): - readline_libs.append('curses') +@@ -610,11 +609,11 @@ class PyBuildExt(build_ext): + elif curses_library: + readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], + ['/usr/'+sys.lib+'/termcap'], @@ -299,7 +299,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1353,18 +1352,17 @@ class PyBuildExt(build_ext): +@@ -1496,18 +1495,17 @@ class PyBuildExt(build_ext): # Check for various platform-specific directories if platform == 'sunos5': include_dirs.append('/usr/openwin/include') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.6A79XM/_old 2011-01-15 02:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6A79XM/_new 2011-01-15 02:57:04.000000000 +0100 @@ -2,12 +2,12 @@ <services> <service name="download_url"> <param name="protocol">http</param> - <param name="host">python.org</param> - <param name="path">/ftp/python/3.1.2/Python-3.1.2.tar.bz2</param> + <param name="host">www.python.org</param> + <param name="path">/ftp/python/3.1.3/Python-3.1.3.tar.bz2</param> </service> <service name="verify_file"> - <param name="file">_service:download_url:Python-3.1.2.tar.bz2</param> + <param name="file">_service:download_url:Python-3.1.3.tar.bz2</param> <param name="verifier">sha256</param> - <param name="checksum">23a43b5ffffd6b86adebac805c8230d7ad490009e08b8d02806d90c8f01bee28</param> + <param name="checksum">77f6f41a51be4ca85d83670405c8281dd1237bb00d8be8a7560cb3ccdf5558cb</param> </service> </services> ++++++ _service:download_url:Python-3.1.2.tar.bz2 -> _service:download_url:Python-3.1.3.tar.bz2 ++++++ python3/_service:download_url:Python-3.1.2.tar.bz2 python3/_service:download_url:Python-3.1.3.tar.bz2 differ: char 11, line 1 ++++++ python-2.5.2-fwrapv.patch ++++++ --- /var/tmp/diff_new_pack.6A79XM/_old 2011-01-15 02:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6A79XM/_new 2011-01-15 02:57:04.000000000 +0100 @@ -1,13 +1,13 @@ Index: Makefile.pre.in =================================================================== ---- Makefile.pre.in.orig -+++ Makefile.pre.in +--- Makefile.pre.in.orig 2011-01-14 21:02:42.000000000 +0100 ++++ Makefile.pre.in 2011-01-14 21:03:45.631337518 +0100 @@ -59,7 +59,7 @@ MAKESETUP= $(srcdir)/Modules/makese # Compiler options OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ --CFLAGS= $(BASECFLAGS) $(OPT) $(EXTRA_CFLAGS) -+CFLAGS= $(BASECFLAGS) $(OPT) -fwrapv $(EXTRA_CFLAGS) +-CFLAGS= $(BASECFLAGS) @CFLAGS@ $(OPT) $(EXTRA_CFLAGS) ++CFLAGS= $(BASECFLAGS) @CFLAGS@ $(OPT) -fwrapv $(EXTRA_CFLAGS) # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to # be able to build extension modules using the directories specified in the # environment variables ++++++ python-3.0b3-ssl-compat.patch ++++++ --- /var/tmp/diff_new_pack.6A79XM/_old 2011-01-15 02:57:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6A79XM/_new 2011-01-15 02:57:04.000000000 +0100 @@ -1,12 +1,13 @@ Index: Modules/_ssl.c =================================================================== ---- Modules/_ssl.c.orig -+++ Modules/_ssl.c -@@ -311,6 +311,7 @@ newPySSLObject(PySocketSockObject *Sock, - errstr = ERRSTR("Invalid SSL protocol variant specified."); - goto fail; - } -+ SSL_CTX_set_options(self->ctx, SSL_OP_ALL); /* ssl compatibility */ +--- Modules/_ssl.c.orig 2010-10-14 00:20:48.000000000 +0200 ++++ Modules/_ssl.c 2011-01-14 21:01:50.303538828 +0100 +@@ -317,6 +317,8 @@ newPySSLObject(PySocketSockObject *Sock, + goto fail; + } - if (certreq != PY_SSL_CERT_NONE) { - if (cacerts_file == NULL) { ++ SSL_CTX_set_options(self->ctx, SSL_OP_ALL); /* ssl compatibility */ ++ + if (certreq != PY_SSL_CERT_NONE) { + if (cacerts_file == NULL) { + errstr = ERRSTR("No root certificates specified for " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org