Hello community,
here is the log from the commit of package python3 for openSUSE:Factory
checked in at Tue Dec 22 00:40:15 CET 2009.
--------
--- python3/python3.changes 2009-09-08 16:28:58.000000000 +0200
+++ python3/python3.changes 2009-11-03 20:21:54.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 3 19:14:00 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-doc.spec ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -19,12 +19,12 @@
Name: python3-doc
Url: http://www.python.org/
-License: Python License ..
+License: Python ..
Group: Development/Languages/Python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation for Python.
Version: 3.1
-Release: 2
+Release: 3
%define pyver 3.1
BuildArch: noarch
%define tarname Python-%{pyver}
@@ -45,7 +45,7 @@
%package pdf
-License: Python License ..
+License: Python ..
Provides: pyth_pdf
Obsoletes: pyth_pdf
Summary: Python PDF Documentation
++++++ python3.spec ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -21,12 +21,12 @@
BuildRequires: db-devel fdupes gcc-c++ gdbm-devel gettext-tools gmp-devel intltool libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel
#Requires: openssl >= 0.9.8e
Url: http://www.python.org/
-License: MIT License (or similar)
+License: MIT
Group: Development/Languages/Python
AutoReqProv: on
Summary: Python3 Interpreter
Version: 3.1
-Release: 2
+Release: 3
%define tarname Python-%{version}
Source0: %{tarname}.tar.bz2
Source6: README.SUSE
@@ -69,7 +69,7 @@
Guido van Rossum
%package idle
-License: Python License ..
+License: Python ..
Requires: %{name} = %{version} python3-tk
Summary: An Integrated Development Environment for Python
Group: Development/Languages/Python
@@ -88,7 +88,7 @@
Guido van Rossum
%package demo
-License: Python License ..
+License: Python ..
Requires: %{name} = %{version}
Summary: Python Demonstration Scripts
Group: Development/Languages/Python
@@ -105,7 +105,7 @@
Guido van Rossum
%package devel
-License: Python License ..
+License: Python ..
Requires: %{name} = %{version}
Summary: Include Files and Libraries Mandatory for Building Python Modules
Group: Development/Languages/Python
@@ -129,7 +129,7 @@
Guido van Rossum
%package tk
-License: Python License ..
+License: Python ..
Requires: %{name} = %{version}
Summary: TkInter - Python Tk Interface
Group: Development/Libraries/Python
@@ -146,7 +146,7 @@
Guido van Rossum
%package curses
-License: Python License ..
+License: Python ..
Requires: %{name} = %{version}
Summary: Python Interface to the (N)Curses Library
Group: Development/Libraries/Python
@@ -163,7 +163,7 @@
Guido van Rossum
%package dbm
-License: MIT License (or similar)
+License: MIT
Requires: %{name} = %{version}
Summary: Python Interface to the GDBM Library
Group: Development/Languages/Python
@@ -180,7 +180,7 @@
Guido van Rossum
%package xml
-License: Python License ..
+License: Python ..
Requires: %{name} = %{version}
Summary: A Python XML Interface
Group: Development/Libraries/Python
@@ -193,7 +193,7 @@
%package 2to3
-License: Python License ..
+License: Python ..
Requires: %{name} = %{version}
Summary: Python 3.0 conversion tool
Group: Development/Languages/Python
++++++ Python-2.3.3-dirs.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,9 +1,11 @@
# force use of directories passed to configure script
---- Makefile.pre.in 2003-09-20 12:50:28.000000000 +0200
-+++ Makefile.pre.in 2003-10-02 11:05:14.000000000 +0200
-@@ -78,12 +78,12 @@
- exec_prefix= @exec_prefix@
+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
++++++ Python-3.0b1-distutils-rpm-8.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,6 +1,8 @@
---- Python-2.4c1.orig/Lib/distutils/command/install.py 2004-11-23 12:03:25.394124018 +0100
-+++ Python-2.4c1/Lib/distutils/command/install.py 2004-11-23 12:29:28.270687563 +0100
-@@ -135,6 +135,8 @@
+Index: Python-3.1/Lib/distutils/command/install.py
+===================================================================
+--- Python-3.1.orig/Lib/distutils/command/install.py
++++ Python-3.1/Lib/distutils/command/install.py
+@@ -178,6 +178,8 @@ class install(Command):
('record=', None,
"filename in which to record list of installed files"),
@@ -9,7 +11,7 @@
]
boolean_options = ['compile', 'force', 'skip-build']
-@@ -207,6 +209,7 @@
+@@ -259,6 +261,7 @@ class install(Command):
#self.install_info = None
self.record = None
@@ -17,7 +19,7 @@
# -- Option finalizing methods -------------------------------------
-@@ -508,12 +511,61 @@
+@@ -595,12 +598,61 @@ class install(Command):
self.create_path_file()
# write list of installed files, if requested.
++++++ Python-3.1-multilib.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,8 +1,8 @@
-Index: Python-2.6.2/Include/pythonrun.h
+Index: Python-3.1/Include/pythonrun.h
===================================================================
---- Python-2.6.2.orig/Include/pythonrun.h
-+++ Python-2.6.2/Include/pythonrun.h
-@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void);
+--- Python-3.1.orig/Include/pythonrun.h
++++ Python-3.1/Include/pythonrun.h
+@@ -112,6 +112,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,20 +11,20 @@
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-Index: Python-2.6.2/Lib/distutils/command/install.py
+Index: Python-3.1/Lib/distutils/command/install.py
===================================================================
---- Python-2.6.2.orig/Lib/distutils/command/install.py
-+++ Python-2.6.2/Lib/distutils/command/install.py
-@@ -22,6 +22,8 @@ from site import USER_BASE
- from site import USER_SITE
-
+--- Python-3.1.orig/Lib/distutils/command/install.py
++++ Python-3.1/Lib/distutils/command/install.py
+@@ -27,6 +27,8 @@ else:
+ from site import USER_SITE
+ HAS_USER_SITE = True
+libname = sys.lib
+
if sys.version < "2.2":
WINDOWS_SCHEME = {
'purelib': '$base',
-@@ -42,14 +44,14 @@ else:
+@@ -47,14 +49,14 @@ else:
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
@@ -41,11 +41,11 @@
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
-Index: Python-2.6.2/Lib/distutils/sysconfig.py
+Index: Python-3.1/Lib/distutils/sysconfig.py
===================================================================
---- Python-2.6.2.orig/Lib/distutils/sysconfig.py
-+++ Python-2.6.2/Lib/distutils/sysconfig.py
-@@ -115,8 +115,11 @@ def get_python_lib(plat_specific=0, stan
+--- Python-3.1.orig/Lib/distutils/sysconfig.py
++++ Python-3.1/Lib/distutils/sysconfig.py
+@@ -117,8 +117,11 @@ def get_python_lib(plat_specific=0, stan
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
@@ -59,11 +59,11 @@
if standard_lib:
return libpython
else:
-Index: Python-2.6.2/Lib/pydoc.py
+Index: Python-3.1/Lib/pydoc.py
===================================================================
---- Python-2.6.2.orig/Lib/pydoc.py
-+++ Python-2.6.2/Lib/pydoc.py
-@@ -350,7 +350,7 @@ class Doc:
+--- Python-3.1.orig/Lib/pydoc.py
++++ Python-3.1/Lib/pydoc.py
+@@ -343,7 +343,7 @@ class Doc:
docloc = os.environ.get("PYTHONDOCS",
"http://docs.python.org/library")
@@ -72,11 +72,11 @@
"python"+sys.version[0:3])
if (isinstance(object, type(os)) and
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
-Index: Python-2.6.2/Lib/site.py
+Index: Python-3.1/Lib/site.py
===================================================================
---- Python-2.6.2.orig/Lib/site.py
-+++ Python-2.6.2/Lib/site.py
-@@ -265,13 +265,19 @@ def addsitepackages(known_paths):
+--- Python-3.1.orig/Lib/site.py
++++ Python-3.1/Lib/site.py
+@@ -258,13 +258,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-2.6.2/Lib/trace.py
+Index: Python-3.1/Lib/trace.py
===================================================================
---- Python-2.6.2.orig/Lib/trace.py
-+++ Python-2.6.2/Lib/trace.py
-@@ -757,10 +757,10 @@ def main(argv=None):
+--- Python-3.1.orig/Lib/trace.py
++++ Python-3.1/Lib/trace.py
+@@ -755,10 +755,10 @@ def main(argv=None):
# should I also call expanduser? (after all, could use $HOME)
s = s.replace("$prefix",
@@ -116,11 +116,11 @@
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
-Index: Python-2.6.2/Makefile.pre.in
+Index: Python-3.1/Makefile.pre.in
===================================================================
---- Python-2.6.2.orig/Makefile.pre.in
-+++ Python-2.6.2/Makefile.pre.in
-@@ -75,6 +75,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
+--- Python-3.1.orig/Makefile.pre.in
++++ Python-3.1/Makefile.pre.in
+@@ -78,6 +78,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
@@ -129,7 +129,7 @@
# Install prefix for architecture-independent files
prefix= @prefix@
-@@ -509,6 +511,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
+@@ -533,6 +535,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
@@ -137,8 +137,8 @@
-o $@ $(srcdir)/Modules/getpath.c
Modules/python.o: $(srcdir)/Modules/python.c
-@@ -540,7 +543,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
- Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
+@@ -565,7 +568,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
- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
@@ -146,10 +146,10 @@
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-Index: Python-2.6.2/Modules/getpath.c
+Index: Python-3.1/Modules/getpath.c
===================================================================
---- Python-2.6.2.orig/Modules/getpath.c
-+++ Python-2.6.2/Modules/getpath.c
+--- Python-3.1.orig/Modules/getpath.c
++++ Python-3.1/Modules/getpath.c
@@ -116,9 +116,11 @@
#define EXEC_PREFIX PREFIX
#endif
@@ -164,19 +164,19 @@
#endif
#ifndef LANDMARK
-@@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1];
+@@ -129,7 +131,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;
-static wchar_t lib_python[] = L"lib/python" VERSION;
+static wchar_t lib_python[] = LIB_PYTHON;
- static void
- reduce(char *dir)
-Index: Python-2.6.2/Python/getplatform.c
+ /* In principle, this should use HAVE__WSTAT, and _wstat
+ should be detected by autoconf. However, no current
+Index: Python-3.1/Python/getplatform.c
===================================================================
---- Python-2.6.2.orig/Python/getplatform.c
-+++ Python-2.6.2/Python/getplatform.c
+--- Python-3.1.orig/Python/getplatform.c
++++ Python-3.1/Python/getplatform.c
@@ -10,3 +10,23 @@ Py_GetPlatform(void)
{
return PLATFORM;
@@ -201,11 +201,11 @@
+{
+ return LIB;
+}
-Index: Python-2.6.2/Python/sysmodule.c
+Index: Python-3.1/Python/sysmodule.c
===================================================================
---- Python-2.6.2.orig/Python/sysmodule.c
-+++ Python-2.6.2/Python/sysmodule.c
-@@ -1379,6 +1379,10 @@ _PySys_Init(void)
+--- 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()));
@@ -216,11 +216,11 @@
SET_SYS_FROM_STRING("executable",
PyUnicode_FromWideChar(
Py_GetProgramFullPath(), -1));
-Index: Python-2.6.2/configure.in
+Index: Python-3.1/configure.in
===================================================================
---- Python-2.6.2.orig/configure.in
-+++ Python-2.6.2/configure.in
-@@ -574,6 +574,41 @@ SunOS*)
+--- Python-3.1.orig/configure.in
++++ Python-3.1/configure.in
+@@ -542,6 +542,41 @@ SunOS*)
;;
esac
@@ -262,11 +262,11 @@
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
-Index: Python-2.6.2/setup.py
+Index: Python-3.1/setup.py
===================================================================
---- Python-2.6.2.orig/setup.py
-+++ Python-2.6.2/setup.py
-@@ -310,7 +310,7 @@ class PyBuildExt(build_ext):
+--- Python-3.1.orig/setup.py
++++ Python-3.1/setup.py
+@@ -295,7 +295,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
-@@ -362,8 +362,7 @@ class PyBuildExt(build_ext):
+@@ -342,8 +342,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,7 +285,7 @@
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
-@@ -585,11 +584,11 @@ class PyBuildExt(build_ext):
+@@ -522,11 +521,11 @@ class PyBuildExt(build_ext):
elif self.compiler.find_library_file(lib_dirs, 'curses'):
readline_libs.append('curses')
elif self.compiler.find_library_file(lib_dirs +
@@ -299,7 +299,7 @@
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -1582,18 +1581,17 @@ class PyBuildExt(build_ext):
+@@ -1353,18 +1352,17 @@ class PyBuildExt(build_ext):
# Check for various platform-specific directories
if platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
++++++ python-2.5.1-sqlite.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,6 +1,8 @@
---- Modules/_sqlite/cursor.c
+Index: Modules/_sqlite/cursor.c
+===================================================================
+--- Modules/_sqlite/cursor.c.orig
+++ Modules/_sqlite/cursor.c
-@@ -825,6 +825,9 @@
+@@ -827,6 +827,9 @@ PyObject* pysqlite_cursor_executescript(
goto error;
}
++++++ python-2.5.2-fwrapv.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,6 +1,8 @@
---- Makefile.pre.in
+Index: Makefile.pre.in
+===================================================================
+--- Makefile.pre.in.orig
+++ Makefile.pre.in
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@ MAKESETUP= $(srcdir)/Modules/makese
# Compiler options
OPT= @OPT@
BASECFLAGS= @BASECFLAGS@
++++++ python-2.6b1-localpath.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,6 +1,8 @@
---- Lib/site.py
+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
+++ Lib/site.py
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ import os
import builtins
# Prefixes for site-packages; add additional prefixes like /usr/local here
++++++ python-2.6b3-curses-panel.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,6 +1,8 @@
---- Modules/_curses_panel.c
+Index: Modules/_curses_panel.c
+===================================================================
+--- Modules/_curses_panel.c.orig
+++ Modules/_curses_panel.c
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ static char *PyCursesVersion = "2.1";
#include "py_curses.h"
++++++ python-3.0-https_warn.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,8 +1,10 @@
---- Lib/urllib/request.py
+Index: Lib/urllib/request.py
+===================================================================
+--- Lib/urllib/request.py.orig
+++ Lib/urllib/request.py
-@@ -2110,7 +2110,10 @@
- # handled in proxy_bypass_environment
- continue
+@@ -2090,7 +2090,10 @@ def getproxies_environment():
+ for name, value in os.environ.items():
+ name = name.lower()
if value and name[-6:] == '_proxy':
- proxies[name[:-6]] = value
+ if name == 'https_proxy':
++++++ python-3.0b3-ssl-compat.patch ++++++
--- /var/tmp/diff_new_pack.Tfmq1p/_old 2009-12-22 00:31:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Tfmq1p/_new 2009-12-22 00:31:31.000000000 +0100
@@ -1,6 +1,8 @@
---- Modules/_ssl.c
+Index: Modules/_ssl.c
+===================================================================
+--- Modules/_ssl.c.orig
+++ Modules/_ssl.c
-@@ -309,6 +309,7 @@
+@@ -311,6 +311,7 @@ newPySSLObject(PySocketSockObject *Sock,
errstr = ERRSTR("Invalid SSL protocol variant specified.");
goto fail;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org