commit python3 for openSUSE:Factory
Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at Fri Aug 7 23:52:34 CEST 2009. -------- --- python3/python3-doc.changes 2008-09-17 19:42:02.000000000 +0200 +++ python3/python3-doc.changes 2009-08-06 20:49:14.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 6 20:48:25 CEST 2009 - matejcik@suse.cz + +- updated to 3.1 documentation + +------------------------------------------------------------------- --- python3/python3.changes 2009-07-16 10:42:34.000000000 +0200 +++ python3/python3.changes 2009-08-07 19:26:14.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 6 20:31:56 CEST 2009 - matejcik@suse.cz + +- update to 3.1 + * new version, much improved over the shakedown 3.0 series + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Python-3.0b1-multilib.patch Python-3.0b3.tar.bz2 html-2.5.1.tar.bz2 pdf-a4-2.5.1.tar.bz2 pdf-letter-2.5.1.tar.bz2 New: ---- Python-3.1-multilib.patch Python-3.1.tar.bz2 python-3.1-docs-html.tar.bz2 python-3.1-docs-pdf-a4.tar.bz2 python-3.1-docs-pdf-letter.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.ko9DIe/_old 2009-08-07 23:51:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ko9DIe/_new 2009-08-07 23:51:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python3-doc (Version 2.5.1) +# spec file for package python3-doc (Version 3.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,17 +23,17 @@ Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. -Version: 2.5.1 -Release: 4 -%define pyver 3.0b3 +Version: 3.1 +Release: 1 +%define pyver 3.1 BuildArch: noarch %define tarname Python-%{pyver} %define pyname python Enhances: %{pyname}=%{pyver} Source0: %{tarname}.tar.bz2 -Source1: html-%{version}.tar.bz2 -Source2: pdf-a4-%{version}.tar.bz2 -Source3: pdf-letter-%{version}.tar.bz2 +Source1: %{pyname}-%{version}-docs-html.tar.bz2 +Source2: %{pyname}-%{version}-docs-pdf-a4.tar.bz2 +Source3: %{pyname}-%{version}-docs-pdf-letter.tar.bz2 Provides: pyth_doc pyth_ps Obsoletes: pyth_doc pyth_ps @@ -74,13 +74,12 @@ 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-Docs-%{version}/* . ; rmdir Python-Docs-%{version}) +( cd $PDOCS/html; mv python-%{version}-docs-html/* . ; rm -rf python-%{version}-docs-html) tar xfj %{S:2} -C $PDOCS/paper-a4 -( cd $PDOCS/paper-a4; mv Python-Docs-%{version}/* . ; rmdir Python-Docs-%{version}) +( cd $PDOCS/paper-a4; mv docs-pdf/* . ; rm -rf docs-pdf) tar xfj %{S:3} -C $PDOCS/paper-letter -( cd $PDOCS/paper-letter; mv Python-Docs-%{version}/* . ; rmdir Python-Docs-%{version}) +( cd $PDOCS/paper-letter; mv docs-pdf/* . ; rm -rf docs-pdf) install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt -install -c -m 644 Doc/TODO.txt $PDOCS/TODO.txt install -c -m 644 Doc/README.txt $PDOCS/README.txt for i in Misc/* ; do [ -f $i ] && install -c -m 644 $i $PDOCS/Misc/ @@ -96,7 +95,6 @@ %doc %{_docdir}/%{pyname}/html %doc %{_docdir}/%{pyname}/ACKS.txt %doc %{_docdir}/%{pyname}/README.txt -%doc %{_docdir}/%{pyname}/TODO.txt %files pdf %defattr(644, root, root, 755) ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.ko9DIe/_old 2009-08-07 23:51:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ko9DIe/_new 2009-08-07 23:51:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python3 (Version 3.0b3) +# spec file for package python3 (Version 3.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Group: Development/Languages/Python AutoReqProv: on Summary: Python3 Interpreter -Version: 3.0b3 -Release: 2 +Version: 3.1 +Release: 1 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 Source6: README.SUSE @@ -38,7 +38,7 @@ Source13: distutils.cfg Patch01: Python-2.3.3-dirs.patch Patch10: Python-3.0b1-distutils-rpm-8.patch -Patch21: Python-3.0b1-multilib.patch +Patch21: Python-3.1-multilib.patch Patch23: python-3.0b3-ssl-compat.patch Patch25: python-2.6b1-canonicalize2.patch Patch26: python-2.6b1-localpath.patch @@ -51,7 +51,7 @@ Patch36: python-2.6b3-curses-panel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) -%define idle_name idle +%define idle_name idle3 %description Python is an interpreted, object-oriented programming language, and is @@ -226,7 +226,7 @@ #%if 0%{?suse_version} #%endif ##%patch34 -%patch35 +##%patch35 %if %suse_version > 1100 %patch36 %endif @@ -260,8 +260,8 @@ --docdir=%{_docdir}/python \ --enable-ipv6 \ --with-fpectl \ - --enable-shared \ - --enable-unicode=ucs4 + --enable-shared +# --with-dbmliborder=gdbm ######################################## # compile ######################################## @@ -273,25 +273,24 @@ # at some point, and the machine does not build anything more until a # timeout several hours later. %ifnarch hppa %arm -# extensive bsddb test fails (probably on all 64-bit arches): -# Berkeley DB library configured to support only private environments # test_file fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin # test_nis fails in autobuild env. probably a misconfiguration of mbuild servers EXCLUDE="-x test_file -x test_nis" +# test_distutils fails on some library dir breakage that will need to be solved later, but nevertheless, +# won't occur on a live system +EXCLUDE="$EXCLUDE -x test_distutils" # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : fi make test TESTOPTS="-l $EXCLUDE" -# test bsddb: -#make test TESTOPTS="-l -u bsddb" # use network, be verbose: #make test TESTOPTS="-l -u network -v" %endif %install # replace rest of /usr/local/bin/python or /usr/bin/python2.5 with /usr/bin/python3 -find . -wholename "./Parser" -prune -o -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@' +find . -path "./Parser" -prune -o -path "./Python/makeopcodetargets.py" -prune -o -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@' # the grep inbetween makes it much faster ######################################## # install it @@ -303,8 +302,8 @@ # install site-specific tweaks # install -m 644 %{S:12} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version} install -m 644 %{S:13} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/distutils -ln -s python%{python_version} ${RPM_BUILD_ROOT}%{_bindir}/python3 -mv ${RPM_BUILD_ROOT}%{_bindir}/pydoc ${RPM_BUILD_ROOT}%{_bindir}/pydoc3 +# overwrite the copied binary with a link +ln -sf python%{python_version} ${RPM_BUILD_ROOT}%{_bindir}/python3 rm -f ${RPM_BUILD_ROOT}%{_bindir}/smtpd.py ######################################## # some cleanups @@ -416,14 +415,16 @@ %{_libdir}/python%{python_version}/config %defattr(644, root, root, 755) %{_libdir}/libpython%{python_version}.so +%{_libdir}/pkgconfig/* %{_prefix}/include/python%{python_version} %{_libdir}/python%{python_version}/test %defattr(755, root, root) %{_bindir}/python%{python_version}-config +%{_bindir}/python3-config %files 2to3 %defattr(644, root, root, 755) -%{_bindir}/2to3 +%attr(755, root, root) %{_bindir}/2to3 %{_libdir}/python%{python_version}/lib2to3 %files @@ -434,22 +435,23 @@ %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README.SUSE -#%doc %{_mandir}/man1/python.1* +%doc %{_mandir}/man1/python%{python_version}.1* %{_libdir}/libpython%{python_version}.so.* #%{_libdir}/python %dir %{_libdir}/python%{python_version} %{_libdir}/python%{python_version}/*.* -%{_libdir}/python%{python_version}/bsddb %{_libdir}/python%{python_version}/ctypes %{_libdir}/python%{python_version}/distutils %{_libdir}/python%{python_version}/email %{_libdir}/python%{python_version}/encodings %{_libdir}/python%{python_version}/html %{_libdir}/python%{python_version}/http +%{_libdir}/python%{python_version}/importlib %{_libdir}/python%{python_version}/json %{_libdir}/python%{python_version}/logging %{_libdir}/python%{python_version}/multiprocessing %{_libdir}/python%{python_version}/plat-* +%{_libdir}/python%{python_version}/pydoc_data %{_libdir}/python%{python_version}/sqlite3 %{_libdir}/python%{python_version}/urllib %{_libdir}/python%{python_version}/wsgiref @@ -457,18 +459,14 @@ %{_libdir}/python%{python_version}/site-packages/README %dir %{_libdir}/python%{python_version}/lib-dynload %{_libdir}/python%{python_version}/lib-dynload/_bisect.so -%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so -%{_libdir}/python%{python_version}/lib-dynload/_bsddb.so %{_libdir}/python%{python_version}/lib-dynload/_csv.so %{_libdir}/python%{python_version}/lib-dynload/_collections.so %{_libdir}/python%{python_version}/lib-dynload/_ctypes.so %{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so %{_libdir}/python%{python_version}/lib-dynload/_elementtree.so -%{_libdir}/python%{python_version}/lib-dynload/_functools.so %{_libdir}/python%{python_version}/lib-dynload/_hashlib.so %{_libdir}/python%{python_version}/lib-dynload/_heapq.so %{_libdir}/python%{python_version}/lib-dynload/_json.so -%{_libdir}/python%{python_version}/lib-dynload/_locale.so %{_libdir}/python%{python_version}/lib-dynload/_lsprof.so %{_libdir}/python%{python_version}/lib-dynload/_multiprocessing.so %{_libdir}/python%{python_version}/lib-dynload/_pickle.so @@ -476,7 +474,6 @@ %{_libdir}/python%{python_version}/lib-dynload/_socket.so %{_libdir}/python%{python_version}/lib-dynload/_sqlite3.so %{_libdir}/python%{python_version}/lib-dynload/_ssl.so -%{_libdir}/python%{python_version}/lib-dynload/_stringio.so %{_libdir}/python%{python_version}/lib-dynload/_struct.so %{_libdir}/python%{python_version}/lib-dynload/_testcapi.so %{_libdir}/python%{python_version}/lib-dynload/array.so ++++++ Python-3.0b1-multilib.patch -> Python-3.1-multilib.patch ++++++ --- python3/Python-3.0b1-multilib.patch 2008-06-27 15:47:13.000000000 +0200 +++ python3/Python-3.1-multilib.patch 2009-08-06 20:35:31.000000000 +0200 @@ -1,6 +1,8 @@ ---- Python-2.6b1/Include/pythonrun.h -+++ Python-2.6b1/Include/pythonrun.h -@@ -108,6 +108,8 @@ +Index: Python-2.6.2/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); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); @@ -9,9 +11,11 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); ---- Python-2.6b1/Lib/distutils/command/install.py -+++ Python-2.6b1/Lib/distutils/command/install.py -@@ -22,6 +22,8 @@ +Index: Python-2.6.2/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 @@ -20,68 +24,46 @@ if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', -@@ -41,15 +43,15 @@ - +@@ -42,14 +44,14 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', + 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/'+libname+'/python$py_version_short/site-packages', + 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', }, 'unix_home': { -- 'purelib': '$base/lib/python', + 'purelib': '$base/lib/python', - 'platlib': '$base/lib/python', -+ 'purelib': '$base/'+libname+'/python', + 'platlib': '$base/'+libname+'/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', ---- Python-2.6b1/Lib/distutils/sysconfig.py -+++ Python-2.6b1/Lib/distutils/sysconfig.py -@@ -116,7 +116,7 @@ +Index: Python-2.6.2/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 + prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": - libpython = os.path.join(prefix, +- libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) -+ sys.lib, "python" + get_python_version()) ++ if plat_specific or standard_lib: ++ lib = sys.lib ++ else: ++ lib = "lib" ++ libpython = os.path.join(prefix, lib, "python" + get_python_version()) if standard_lib: return libpython else: ---- Python-2.6b1/Lib/distutils/tests/test_install.py -+++ Python-2.6b1/Lib/distutils/tests/test_install.py -@@ -1,6 +1,7 @@ - """Tests for distutils.command.install.""" - - import os -+import sys - import unittest - - from distutils.command.install import install -@@ -23,7 +24,7 @@ - dist.script_name = os.path.join(builddir, "setup.py") - dist.command_obj["build"] = support.DummyCommand( - build_base=builddir, -- build_lib=os.path.join(builddir, "lib"), -+ build_lib=os.path.join(builddir, sys.lib), - ) - - cmd = install(dist) -@@ -38,7 +39,7 @@ - expected = os.path.normpath(expected) - self.assertEqual(got, expected) - -- libdir = os.path.join(destination, "lib", "python") -+ libdir = os.path.join(destination, sys.lib, "python") - check_path(cmd.install_lib, libdir) - check_path(cmd.install_platlib, libdir) - check_path(cmd.install_purelib, libdir) ---- Python-2.6b1/Lib/pydoc.py -+++ Python-2.6b1/Lib/pydoc.py -@@ -347,7 +347,7 @@ +Index: Python-2.6.2/Lib/pydoc.py +=================================================================== +--- Python-2.6.2.orig/Lib/pydoc.py ++++ Python-2.6.2/Lib/pydoc.py +@@ -350,7 +350,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library") @@ -90,9 +72,11 @@ "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', ---- Python-2.6b1/Lib/site.py -+++ Python-2.6b1/Lib/site.py -@@ -265,13 +265,13 @@ +Index: Python-2.6.2/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): if sys.platform in ('os2emx', 'riscos'): sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -101,7 +85,13 @@ "python" + sys.version[:3], "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-python")) ++ if sys.lib != "lib": ++ sitedirs.append(os.path.join(prefix, "lib", ++ "python" + sys.version[:3], ++ "site-packages")) + sitedirs.append(os.path.join(prefix, sys.lib, "site-python")) ++ if sys.lib != "lib": ++ sitedirs.append(os.path.join(prefix, "lib", "site-python")) else: sitedirs.append(prefix) - sitedirs.append(os.path.join(prefix, "lib", "site-packages")) @@ -109,9 +99,11 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple ---- Python-2.6b1/Lib/trace.py -+++ Python-2.6b1/Lib/trace.py -@@ -757,10 +757,10 @@ +Index: Python-2.6.2/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): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -124,9 +116,11 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) ---- Python-2.6b1/Makefile.pre.in -+++ Python-2.6b1/Makefile.pre.in -@@ -75,6 +75,8 @@ +Index: Python-2.6.2/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 # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -135,7 +129,7 @@ # Install prefix for architecture-independent files prefix= @prefix@ -@@ -505,6 +507,7 @@ +@@ -509,6 +511,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -143,7 +137,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -536,7 +539,7 @@ +@@ -540,7 +543,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -152,8 +146,10 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c ---- Python-2.6b1/Modules/getpath.c -+++ Python-2.6b1/Modules/getpath.c +Index: Python-2.6.2/Modules/getpath.c +=================================================================== +--- Python-2.6.2.orig/Modules/getpath.c ++++ Python-2.6.2/Modules/getpath.c @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -168,7 +164,7 @@ #endif #ifndef LANDMARK -@@ -129,7 +131,7 @@ +@@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1]; static wchar_t exec_prefix[MAXPATHLEN+1]; static wchar_t progpath[MAXPATHLEN+1]; static wchar_t *module_search_path = NULL; @@ -176,16 +172,18 @@ +static wchar_t lib_python[] = LIB_PYTHON; static void - reduce(wchar_t *dir) ---- Python-2.6b1/Python/getplatform.c -+++ Python-2.6b1/Python/getplatform.c -@@ -10,3 +10,23 @@ + reduce(char *dir) +Index: Python-2.6.2/Python/getplatform.c +=================================================================== +--- Python-2.6.2.orig/Python/getplatform.c ++++ Python-2.6.2/Python/getplatform.c +@@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; } + +#ifndef ARCH -+#define ARCH L"unknown" ++#define ARCH "unknown" +#endif + +const char * @@ -203,9 +201,11 @@ +{ + return LIB; +} ---- Python-2.6b1/Python/sysmodule.c -+++ Python-2.6b1/Python/sysmodule.c -@@ -1361,6 +1361,10 @@ +Index: Python-2.6.2/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) PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); @@ -214,11 +214,13 @@ + SET_SYS_FROM_STRING("lib", + PyUnicode_FromString(Py_GetLib())); SET_SYS_FROM_STRING("executable", - PyUnicode_FromString(Py_GetProgramFullPath())); - SET_SYS_FROM_STRING("prefix", ---- Python-2.6b1/configure.in -+++ Python-2.6b1/configure.in -@@ -569,6 +569,41 @@ + PyUnicode_FromWideChar( + Py_GetProgramFullPath(), -1)); +Index: Python-2.6.2/configure.in +=================================================================== +--- Python-2.6.2.orig/configure.in ++++ Python-2.6.2/configure.in +@@ -574,6 +574,41 @@ SunOS*) ;; esac @@ -260,9 +262,11 @@ AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) ---- Python-2.6b1/setup.py -+++ Python-2.6b1/setup.py -@@ -310,7 +310,7 @@ +Index: Python-2.6.2/setup.py +=================================================================== +--- Python-2.6.2.orig/setup.py ++++ Python-2.6.2/setup.py +@@ -310,7 +310,7 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used @@ -271,7 +275,7 @@ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # Add paths specified in the environment variables LDFLAGS and -@@ -361,8 +361,7 @@ +@@ -362,8 +362,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 + [ @@ -281,7 +285,7 @@ ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] -@@ -583,11 +582,11 @@ +@@ -585,11 +584,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 + @@ -295,7 +299,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1540,18 +1539,17 @@ +@@ -1582,18 +1581,17 @@ class PyBuildExt(build_ext): # Check for various platform-specific directories if platform == 'sunos5': include_dirs.append('/usr/openwin/include') ++++++ Python-3.0b3.tar.bz2 -> Python-3.1.tar.bz2 ++++++ python3/Python-3.0b3.tar.bz2 python3/Python-3.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de