OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=27

Python-2.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12e0b278af0f4d741949d2567c8627ae99739be544e510e30dce3f9acbb5a6ff
+size 10957859

Python-2.6rc2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ad716bb6fa17e71643c9f05f9e20288893094ec37c11458d1ed9bb8a4232a35
-size 10801794

_local.pth

@@ -0,0 +1 @@
+import site; import sys; site.addsitedir('/usr/local/' + sys.lib + '/python' + sys.version[:3] + '/site-packages',set())

html-2.5.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:359e820e3af09dc90adddd4b27e18da9664120610cac486681fbb3c8f8240b9c
-size 1626532

macros.python

@@ -11,7 +11,5 @@ find %1 -name '*.pyo' -exec rm -f {} \\; \
 python -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
 }
 %py_requires(d) \
-%define minver %py_ver \
-%define maxver %(python -c "import sys; a,b=sys.version_info[:2]; print '%%d.%%d'%%(a,b+1)" 2>/dev/null || echo PYTHON-NOT-FOUND) \
 BuildRequires: /usr/bin/python %{-d:python-devel} \
-PreReq: python >= %minver, python < %maxver
+PreReq: python = %{py_ver}

pdf-a4-2.5.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:caddfc8988d837cdd58e519da5f8b0c29263e85554f6108d9fde1677612dcd22
-size 5578884

pdf-letter-2.5.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34cedf5ec3ca21b8e105adad07429e7c6dee49c4c17e7d1466655980b88ee906
-size 5604432

python-2.6b1-localpath.patch

@@ -1,11 +0,0 @@
---- Lib/site.py
-+++ Lib/site.py
-@@ -63,7 +63,7 @@
- import __builtin__
- 
- # Prefixes for site-packages; add additional prefixes like /usr/local here
--PREFIXES = [sys.prefix, sys.exec_prefix]
-+PREFIXES = [sys.prefix, sys.exec_prefix, '/usr/local']
- # Enable per user site-packages directory
- # set it to False to disable the feature or True to force the feature
- ENABLE_USER_SITE = None

python-2.6rc1-bug-no-proxy.patch

@@ -1,16 +0,0 @@
-
-=== modified file 'Lib/urllib.py'
---- Lib/urllib.py	2008-07-02 01:57:08 +0000
-+++ Lib/urllib.py	2008-09-16 12:21:26 +0000
-@@ -1299,9 +1299,6 @@
-     proxies = {}
-     for name, value in os.environ.items():
-         name = name.lower()
--        if name == 'no_proxy':
--            # handled in proxy_bypass_environment
--            continue
-         if value and name[-6:] == '_proxy':
-             proxies[name[:-6]] = value
-     return proxies
-
-

python-2.6rc2-sslwrap-simple.patch

@@ -1,42 +0,0 @@
-Index: Lib/ssl.py
-===================================================================
---- Lib/ssl.py	(revision 66515)
-+++ Lib/ssl.py	(working copy)
-@@ -434,7 +434,10 @@
-     for compability with Python 2.5 and earlier.  Will disappear in
-     Python 3.0."""
- 
--    ssl_sock = _ssl.sslwrap(sock._sock, 0, keyfile, certfile, CERT_NONE,
-+    if hasattr(sock, "_sock"):
-+        sock = sock._sock
-+
-+    ssl_sock = _ssl.sslwrap(sock, 0, keyfile, certfile, CERT_NONE,
-                             PROTOCOL_SSLv23, None)
-     ssl_sock.do_handshake()
-     return ssl_sock
-Index: Lib/test/test_ssl.py
-===================================================================
---- Lib/test/test_ssl.py	(revision 66515)
-+++ Lib/test/test_ssl.py	(working copy)
-@@ -58,6 +58,21 @@
-         finally:
-             s.close()
- 
-+    def testSimpleSSLwrap(self):
-+        try:
-+            ssl.sslwrap_simple(socket.socket(socket.AF_INET))
-+        except IOError, e:
-+            if e.errno == 32: # broken pipe when ssl_sock.do_handshake(), this test doesn't care about that
-+                pass
-+            else:
-+                raise
-+        try:
-+            ssl.sslwrap_simple(socket.socket(socket.AF_INET)._sock)
-+        except IOError, e:
-+            if e.errno == 32: # broken pipe when ssl_sock.do_handshake(), this test doesn't care about that
-+                pass
-+            else:
-+                raise
- 
-     def testCrucialConstants(self):
-         ssl.PROTOCOL_SSLv2

python-base.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct  9 18:56:33 CEST 2008 - matejcik@suse.cz
+
+- update to 2.6 final (version name is 2.6.0 to make upgrade from
+  2.6rc2 possible)
+- replaced site.py hack with a .pth file to do the same thing
+  (cleaner solution that doesn't mess up documented behavior
+  and also fixes virtualenv, bnc#430761)
+- enabled profile optimized build
+- fixed %py_requires macro (bnc#346490)
+- provide %name = 2.6
+
 -------------------------------------------------------------------
 Fri Sep 19 20:09:50 CEST 2008 - matejcik@suse.cz
 

python-base.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package python-base (Version 2.6rc2)
+# spec file for package python-base (Version 2.6.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -27,24 +27,25 @@ License:        X11/MIT
 Group:          Development/Languages/Python
 AutoReqProv:    on
 Summary:        Python Interpreter base package
-Version:        2.6rc2
+Version:        2.6.0
 Release:        1
-%define       tarname        Python-%{version}
+#%define       tarname        Python-%{version}
+%define       tarname        Python-2.6
 Source0:        %{tarname}.tar.bz2
 Source1:        macros.python
 Source6:        README.SUSE
 Source13:       distutils.cfg
+Source14:       _local.pth
 Patch01:        Python-2.3.3-dirs.patch
 Patch10:        python-distutils-rpm-8.patch
 Patch21:        Python-2.6b1-multilib.patch
 Patch25:        python-2.6b1-canonicalize2.patch
-Patch26:        python-2.6b1-localpath.patch
 Patch31:        python-2.5.2-fwrapv.patch
 Patch35:        python-2.5.2-configure.patch
-Patch36:        python-2.6rc1-bug-no-proxy.patch
 Patch37:        python-2.6rc2-https-proxy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
+Provides:       %{name} = %{python_version}
 
 %description
 Python is an interpreted, object-oriented programming language, and is
@@ -124,10 +125,8 @@ Authors:
 %patch10 -p1
 %patch21 -p1
 %patch25
-%patch26
 %patch31
 %patch35
-%patch36
 %patch37
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
@@ -159,7 +158,10 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
 ########################################
 # compile
 ########################################
-make %{?jobs:-j%jobs} DESTDIR=$RPM_BUILD_ROOT
+LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \
+    make %{?jobs:-j%jobs} \
+        DESTDIR=$RPM_BUILD_ROOT \
+        profile-opt
 
 %check
 # on hppa, the threading of glibc is quite broken. The tests just stop
@@ -194,6 +196,7 @@ make \
 # install site-specific tweaks
 ln -s python%{python_version} ${RPM_BUILD_ROOT}%{_bindir}/python2
 install -m 644 %{S:13} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/distutils
+install -m 644 %{S:14} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/site-packages
 install -d -m 755 ${RPM_BUILD_ROOT}/etc/rpm
 install -m 644 %{S:1} ${RPM_BUILD_ROOT}/etc/rpm
 ########################################
@@ -298,6 +301,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python%{python_version}/wsgiref
 %dir %{_libdir}/python%{python_version}/site-packages
 %{_libdir}/python%{python_version}/site-packages/README
+%{_libdir}/python%{python_version}/site-packages/_local.pth
 %dir %{_libdir}/python%{python_version}/lib-dynload
 %{_libdir}/python%{python_version}/lib-dynload/_bisect.so
 %{_libdir}/python%{python_version}/lib-dynload/_bytesio.so
@@ -354,7 +358,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python%{python_version}/lib-dynload/_codecs*.so
 %{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so
 %{_libdir}/python%{python_version}/lib-dynload/audioop.so
-%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info
+#%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info
+%{_libdir}/python%{python_version}/lib-dynload/%{tarname}-py%{python_version}.egg-info
 # these modules don't support 64-bit arches (disabled by setup.py)
 %ifnarch alpha ia64 x86_64 s390x ppc64
 # requires sizeof(int) == sizeof(long) == sizeof(char*)
@@ -368,6 +373,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/python2
 
 %changelog
+* Thu Oct 09 2008 matejcik@suse.cz
+- update to 2.6 final (version name is 2.6.0 to make upgrade from
+  2.6rc2 possible)
+- replaced site.py hack with a .pth file to do the same thing
+  (cleaner solution that doesn't mess up documented behavior
+  and also fixes virtualenv, bnc#430761)
+- enabled profile optimized build
+- fixed %%py_requires macro (bnc#346490)
+- provide %%name = 2.6
 * Fri Sep 19 2008 matejcik@suse.cz
 - moved tests to %%check section
 - update to 2.6rc2

python-doc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct  9 18:58:15 CEST 2008 - matejcik@suse.cz
+
+- updated docs to version 2.6
+
 -------------------------------------------------------------------
 Mon Sep 15 18:34:58 CEST 2008 - matejcik@suse.cz
 

python-doc.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package python-doc (Version 2.5.1)
+# spec file for package python-doc (Version 2.6)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,17 +23,17 @@ License:        Python Copyright
 Group:          Development/Languages/Python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation for Python.
-Version:        2.5.1
+Version:        2.6
-Release:        109
+Release:        1
-%define pyver   2.6rc2
+%define pyver   2.6
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}
 %define       pyname         python
 Enhances:       %{pyname}=%{pyver}
 Source0:        %{tarname}.tar.bz2
-Source1:        html-%{version}.tar.bz2
+Source1:        python-docs-html-%{version}.tar.bz2
-Source2:        pdf-a4-%{version}.tar.bz2
+Source2:        python-docs-pdf-a4-%{version}.tar.bz2
-Source3:        pdf-letter-%{version}.tar.bz2
+Source3:        python-docs-pdf-letter-%{version}.tar.bz2
 Provides:       pyth_doc pyth_ps
 Obsoletes:      pyth_doc pyth_ps
 
@@ -104,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{pyname}/paper-letter
 
 %changelog
+* Thu Oct 09 2008 matejcik@suse.cz
+- updated docs to version 2.6
 * Mon Sep 15 2008 matejcik@suse.cz
 - updated to build against 2.6rc1
 * Wed Jun 25 2008 matejcik@suse.cz

python-docs-html-2.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9c39e51fc19c6ec367f41cd47c0831bc1e4f4c6d615dccfd37337cd7843ae0a
+size 3445776

python-docs-pdf-a4-2.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efddc99e33933c6ca898551db9252592fd0a3f18904f53a5b0c0d41d4de393a4
+size 8804548

python-docs-pdf-letter-2.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3bc9b18b2a77fdd73c2779632324e6c83e5c56472dfd80ba60714073b963887
+size 8847332

python.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct  9 18:57:43 CEST 2008 - matejcik@suse.cz
+
+- update to 2.6 (version name is 2.6.0 to prevent upgrade problems)
+- don't run the whole test suite, only run tests for
+  newly built modules
+- provide %name = 2.6
+
 -------------------------------------------------------------------
 Fri Sep 19 20:10:33 CEST 2008 - matejcik@suse.cz
 

python.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package python (Version 2.6rc2)
+# spec file for package python (Version 2.6.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -27,12 +27,13 @@ Url:            http://www.python.org/
 License:        X11/MIT
 Group:          Development/Languages/Python
 AutoReqProv:    on
-Requires:       python-base
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
-Version:        2.6rc2
+Version:        2.6.0
 Release:        1
-%define       tarname        Python-%{version}
+Requires:       python-base = %{version}
+#%define       tarname        Python-%{version}
+%define       tarname        Python-2.6
 Source0:        %{tarname}.tar.bz2
 Source6:        README.SUSE
 Source8:        pythonstart
@@ -44,15 +45,14 @@ Patch01:        Python-2.3.3-dirs.patch
 Patch21:        Python-2.6b1-multilib.patch
 Patch23:        python-2.6b3-ssl-compat.patch
 Patch25:        python-2.6b1-canonicalize2.patch
-Patch26:        python-2.6b1-localpath.patch
 Patch30:        python-2.5.1-sqlite.patch
 Patch31:        python-2.5.2-fwrapv.patch
 Patch35:        python-2.5.2-configure.patch
 Patch38:        python-2.6b3-curses-panel.patch
-Patch39:        python-2.6rc2-sslwrap-simple.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 %define         idle_name         idle
+Provides:       %{name} = %{python_version}
 
 %description
 Python is an interpreted, object-oriented programming language, and is
@@ -71,7 +71,7 @@ Authors:
 
 %package idle
 License:        Python Copyright
-Requires:       python = %{version} python-tk
+Requires:       python-base = %{version} python-tk
 Summary:        An Integrated Development Environment for Python
 Group:          Development/Languages/Python
 AutoReqProv:    on
@@ -92,7 +92,7 @@ Authors:
 License:        Python Copyright
 Provides:       pyth_dmo
 Obsoletes:      pyth_dmo
-Requires:       python = %{version}
+Requires:       python-base = %{version}
 Summary:        Python Demonstration Scripts
 Group:          Development/Languages/Python
 AutoReqProv:    on
@@ -114,7 +114,7 @@ Provides:       pyth_tk python_tkinter_lib pyth_tkl python-tkinter
 #Provides:       _tkinter.so
 #%endif
 Obsoletes:      pyth_tk pyth_tkl python-tkinter
-Requires:       python = %{version}
+Requires:       python-base = %{version}
 Summary:        TkInter - Python Tk Interface
 Group:          Development/Libraries/Python
 AutoReqProv:    on
@@ -131,7 +131,7 @@ Authors:
 
 %package curses
 License:        Python Copyright
-Requires:       python = %{version}
+Requires:       python-base = %{version}
 Obsoletes:      pyth_cur
 Provides:       pyth_cur
 Summary:        Python Interface to the (N)Curses Library
@@ -150,7 +150,7 @@ Authors:
 
 %package gdbm
 License:        X11/MIT
-Requires:       python = %{version}
+Requires:       python-base = %{version}
 Obsoletes:      pygdmod
 Provides:       pygdmod
 Summary:        Python Interface to the GDBM Library
@@ -175,7 +175,6 @@ Authors:
 %patch21 -p1
 %patch23
 %patch25
-%patch26
 %patch30
 %patch31
 #%if 0%{?suse_version}
@@ -184,7 +183,6 @@ Authors:
 %if %suse_version > 1100
 %patch38
 %endif
-%patch39
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
 find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -223,22 +221,16 @@ make %{?jobs:-j%jobs} DESTDIR=$RPM_BUILD_ROOT
 # at some point, and the machine does not build anything more until a
 # timeout several hours later. 
 %ifnarch hppa %arm
-# test_file fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin
-# test_urllib2 fails in autobuild env, because it's notoriously impossible to resolve an address in autobuild
-EXCLUDE="-x test_urllib2 -x test_file"
-# these two tests work fine but are awfully slow
-EXCLUDE="$EXCLUDE -x test_nis -x test_threading"
 # 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"
+LIST="test_urllib test_ssl test_hashlib test_hmac test_urllib2_localnet test_unicodedata test_tarfile test_sqlite test_tcl test_anydbm test_dumbdbm test_gdbm test_whichdb"
-# use network, be verbose:
+make test TESTOPTS="$LIST"
-#make test TESTOPTS="-l -u network -v"
 %endif
 
 %install
-# replace rest of /usr/local/bin/python or /usr/bin/python2.5 with /usr/bin/python
+# replace rest of /usr/local/bin/python or /usr/bin/python2.x with /usr/bin/python
 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/python@'
 # the grep inbetween makes it much faster
 ########################################
@@ -259,7 +251,7 @@ done
 # kill imageop.so, it's insecure
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}/lib-dynload/imageop.so
 #cleanup for -base
-rm $RPM_BUILD_ROOT%{_bindir}/python{,2.6}
+rm $RPM_BUILD_ROOT%{_bindir}/python{,%{python_version}}
 rm $RPM_BUILD_ROOT%{_bindir}/smtpd.py
 rm $RPM_BUILD_ROOT%{_bindir}/pydoc
 rm $RPM_BUILD_ROOT%{_bindir}/2to3
@@ -343,7 +335,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_codecs*.so
 rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so
 rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/audioop.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/dl.so
-rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info
+#rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info
+rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/%{tarname}-py%{python_version}.egg-info
 %if %suse_version >= 1030
 # replace duplicate .pyo/.pyc with hardlinks
 %fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}
@@ -443,6 +436,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python%{python_version}/lib-dynload/readline.so
 
 %changelog
+* Thu Oct 09 2008 matejcik@suse.cz
+- update to 2.6 (version name is 2.6.0 to prevent upgrade problems)
+- don't run the whole test suite, only run tests for
+  newly built modules
+- provide %%name = 2.6
 * Fri Sep 19 2008 matejcik@suse.cz
 - moved testsuite to %%check section
 - update to 2.6rc2, removing the last remaining security patch