packages: python/python-lib64.patch, python/python-noarch_to_datadir.patch, ...
arekm
arekm at pld-linux.org
Thu May 10 18:28:27 CEST 2012
Author: arekm Date: Thu May 10 16:28:27 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.7.3; include py files
---- Files affected:
packages/python:
python-lib64.patch (1.21 -> 1.22) , python-noarch_to_datadir.patch (1.12 -> 1.13) , python-pythonpath.patch (1.5 -> 1.6) , python.spec (1.386 -> 1.387)
---- Diffs:
================================================================
Index: packages/python/python-lib64.patch
diff -u packages/python/python-lib64.patch:1.21 packages/python/python-lib64.patch:1.22
--- packages/python/python-lib64.patch:1.21 Tue Nov 30 12:10:29 2010
+++ packages/python/python-lib64.patch Thu May 10 18:28:22 2012
@@ -104,14 +104,6 @@
diff -Nur Python-2.5b2.orig/Lib/distutils/tests/test_install.py Python-2.5b2/Lib/distutils/tests/test_install.py
--- Python-2.5b2.orig/Lib/distutils/tests/test_install.py 2004-06-26 00:02:59.000000000 +0100
+++ Python-2.5b2/Lib/distutils/tests/test_install.py 2006-07-12 17:42:51.000000000 +0100
-@@ -1,6 +1,6 @@
- """Tests for distutils.command.install."""
-
--import os
-+import os,sys
- import unittest
-
- from distutils.command.install import install
@@ -39,8 +39,9 @@
self.assertEqual(got, expected)
@@ -302,14 +294,18 @@
added_lib_dirs.append('/usr/X11R5/lib')
--- Python-2.7/Lib/test/test_site.py~ 2010-05-14 01:59:41.000000000 +0200
+++ Python-2.7/Lib/test/test_site.py 2010-07-05 20:36:37.311186935 +0200
-@@ -166,19 +166,19 @@
+@@ -226,7 +226,7 @@
if sys.platform in ('os2emx', 'riscos'):
self.assertEqual(len(dirs), 1)
- wanted = os.path.join('xoxo', 'Lib', 'site-packages')
+ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
self.assertEqual(dirs[0], wanted)
+ elif (sys.platform == "darwin" and
+ sysconfig.get_config_var("PYTHONFRAMEWORK")):
+@@ -242,16 +242,16 @@
elif os.sep == '/':
+ # OS X non-framwework builds, Linux, FreeBSD, etc
self.assertEqual(len(dirs), 2)
- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
+ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
@@ -319,13 +315,14 @@
+ wanted = os.path.join('xoxo', sys.lib, 'site-python')
self.assertEqual(dirs[1], wanted)
else:
+ # other platforms
self.assertEqual(len(dirs), 2)
self.assertEqual(dirs[0], 'xoxo')
- wanted = os.path.join('xoxo', 'lib', 'site-packages')
+ wanted = os.path.join('xoxo', sys.lib, 'site-packages')
self.assertEqual(dirs[1], wanted)
- # let's try the specific Apple location
+ class PthFile(object):
--- Python-2.7/Lib/sysconfig.py.org 2010-05-20 00:20:14.000000000 +0200
+++ Python-2.7/Lib/sysconfig.py 2010-07-06 08:31:15.687728628 +0200
@@ -5,22 +5,24 @@
================================================================
Index: packages/python/python-noarch_to_datadir.patch
diff -u packages/python/python-noarch_to_datadir.patch:1.12 packages/python/python-noarch_to_datadir.patch:1.13
--- packages/python/python-noarch_to_datadir.patch:1.12 Sun Jan 23 17:13:36 2011
+++ packages/python/python-noarch_to_datadir.patch Thu May 10 18:28:22 2012
@@ -139,12 +139,13 @@
bufsz = strlen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
---- Python-2.7.1/Lib/test/test_site.py~ 2011-01-23 16:20:12.113474892 +0100
-+++ Python-2.7.1/Lib/test/test_site.py 2011-01-23 16:49:33.930141557 +0100
-@@ -169,7 +169,7 @@
- wanted = os.path.join('xoxo', sys.lib, 'site-packages')
- self.assertEqual(dirs[0], wanted)
+
+--- p/Lib/test/test_site.py~ 2012-05-10 18:02:09.000000000 +0200
++++ p/Lib/test/test_site.py 2012-05-10 18:09:38.776569290 +0200
+@@ -241,7 +241,7 @@
+ self.assertEqual(dirs[2], wanted)
elif os.sep == '/':
+ # OS X non-framwework builds, Linux, FreeBSD, etc
- self.assertEqual(len(dirs), 2)
+ self.assertEqual(len(dirs), 4)
wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
================================================================
Index: packages/python/python-pythonpath.patch
diff -u packages/python/python-pythonpath.patch:1.5 packages/python/python-pythonpath.patch:1.6
--- packages/python/python-pythonpath.patch:1.5 Mon Jul 5 20:41:39 2010
+++ packages/python/python-pythonpath.patch Thu May 10 18:28:22 2012
@@ -19,27 +19,26 @@
If you find any bugs or have suggestions for improvement, please report them
-diff -urN Python-2.7.org/Doc/c-api/init.rst Python-2.7/Doc/c-api/init.rst
---- Python-2.7.org/Doc/c-api/init.rst 2010-06-14 17:58:39.000000000 +0200
-+++ Python-2.7/Doc/c-api/init.rst 2010-07-05 20:00:03.475503986 +0200
-@@ -196,7 +196,7 @@
+--- p/Doc/c-api/init.rst~ 2012-04-10 01:07:28.000000000 +0200
++++ p/Doc/c-api/init.rst 2012-05-10 17:41:58.815998870 +0200
+@@ -123,7 +123,7 @@
Return the *prefix* for installed platform-independent files. This is derived
through a number of complicated rules from the program name set with
- :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
+ :c:func:`Py_SetProgramName` and some environment variables; for example, if the
- program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
+ program name is ``'/usr/bin/python'``, the prefix is ``'/usr/local'``. The
returned string points into static storage; the caller should not modify its
value. This corresponds to the :makevar:`prefix` variable in the top-level
- :file:`Makefile` and the :option:`--prefix` argument to the :program:`configure`
-@@ -209,7 +209,7 @@
+ :file:`Makefile` and the ``--prefix`` argument to the :program:`configure`
+@@ -136,7 +136,7 @@
Return the *exec-prefix* for installed platform-*dependent* files. This is
derived through a number of complicated rules from the program name set with
- :cfunc:`Py_SetProgramName` and some environment variables; for example, if the
+ :c:func:`Py_SetProgramName` and some environment variables; for example, if the
- program name is ``'/usr/local/bin/python'``, the exec-prefix is
+ program name is ``'/usr/bin/python'``, the exec-prefix is
``'/usr/local'``. The returned string points into static storage; the caller
should not modify its value. This corresponds to the :makevar:`exec_prefix`
- variable in the top-level :file:`Makefile` and the :option:`--exec-prefix`
+ variable in the top-level :file:`Makefile` and the ``--exec-prefix``
diff -urN Python-2.7.org/Doc/c-api/intro.rst Python-2.7/Doc/c-api/intro.rst
--- Python-2.7.org/Doc/c-api/intro.rst 2010-06-11 02:23:01.000000000 +0200
+++ Python-2.7/Doc/c-api/intro.rst 2010-07-05 20:00:03.482863587 +0200
================================================================
Index: packages/python/python.spec
diff -u packages/python/python.spec:1.386 packages/python/python.spec:1.387
--- packages/python/python.spec:1.386 Fri Dec 9 11:25:22 2011
+++ packages/python/python.spec Thu May 10 18:28:22 2012
@@ -43,15 +43,15 @@
Summary(tr.UTF-8): X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом
Name: python
-Version: %{py_ver}.2
-Release: 3
+Version: %{py_ver}.3
+Release: 1
Epoch: 1
License: PSF
Group: Development/Languages/Python
Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.bz2
-# Source0-md5: ba7b2f11ffdbf195ee0d111b9455a5bd
+# Source0-md5: c57477edd6d18bd9eeca2f21add73919
Source1: http://www.python.org/ftp/python/doc/%{dver}/%{name}-%{dver}-docs-html.tar.bz2
-# Source1-md5: 40f0bd51b221662cae14fb0c6b6f622b
+# Source1-md5: 101c13d39f76fd6706aac3a9196b2f01
Patch0: %{name}-db.patch
Patch1: %{name}-pythonpath.patch
Patch2: %{name}-ac_fixes.patch
@@ -693,32 +693,32 @@
%files modules
%defattr(644,root,root,755)
/etc/shrc.d/python-modules*
-%exclude %{py_scriptdir}/_abcoll.py[co]
-%exclude %{py_scriptdir}/abc.py[co]
-%exclude %{py_scriptdir}/UserDict.py[co]
-%exclude %{py_scriptdir}/codecs.py[co]
-%exclude %{py_scriptdir}/copy_reg.py[co]
-%exclude %{py_scriptdir}/genericpath.py[co]
-%exclude %{py_scriptdir}/linecache.py[co]
-%exclude %{py_scriptdir}/locale.py[co]
-%exclude %{py_scriptdir}/posixpath.py[co]
-%exclude %{py_scriptdir}/pdb.py[co]
-%exclude %{py_scriptdir}/profile.py[co]
-%exclude %{py_scriptdir}/pstats.py[co]
-%exclude %{py_scriptdir}/pydoc.py[co]
-%exclude %{py_scriptdir}/re.py[co]
-%exclude %{py_scriptdir}/site.py[co]
-%exclude %{py_scriptdir}/sre_*.py[co]
-%exclude %{py_scriptdir}/stat.py[co]
-%exclude %{py_scriptdir}/sysconfig.py[co]
-%exclude %{py_scriptdir}/timeit.py[co]
-%exclude %{py_scriptdir}/os.py[co]
-%exclude %{py_scriptdir}/_weakrefset.py[co]
-%exclude %{py_scriptdir}/encodings/*.py[co]
-%exclude %{py_scriptdir}/types.py[co]
-%exclude %{py_scriptdir}/warnings.py[co]
+%exclude %{py_scriptdir}/_abcoll.py*
+%exclude %{py_scriptdir}/abc.py*
+%exclude %{py_scriptdir}/UserDict.py*
+%exclude %{py_scriptdir}/codecs.py*
+%exclude %{py_scriptdir}/copy_reg.py*
+%exclude %{py_scriptdir}/genericpath.py*
+%exclude %{py_scriptdir}/linecache.py*
+%exclude %{py_scriptdir}/locale.py*
+%exclude %{py_scriptdir}/posixpath.py*
+%exclude %{py_scriptdir}/pdb.py*
+%exclude %{py_scriptdir}/profile.py*
+%exclude %{py_scriptdir}/pstats.py*
+%exclude %{py_scriptdir}/pydoc.py*
+%exclude %{py_scriptdir}/re.py*
+%exclude %{py_scriptdir}/site.py*
+%exclude %{py_scriptdir}/sre_*.py*
+%exclude %{py_scriptdir}/stat.py*
+%exclude %{py_scriptdir}/sysconfig.py*
+%exclude %{py_scriptdir}/timeit.py*
+%exclude %{py_scriptdir}/os.py*
+%exclude %{py_scriptdir}/_weakrefset.py*
+%exclude %{py_scriptdir}/encodings/*.py*
+%exclude %{py_scriptdir}/types.py*
+%exclude %{py_scriptdir}/warnings.py*
-%{py_scriptdir}/*.py[co]
+%{py_scriptdir}/*.py*
%{py_dyndir}/*.egg-info
@@ -800,70 +800,70 @@
%attr(755,root,root) %{py_dyndir}/zlib.so
%dir %{py_scriptdir}/plat-*
-%{py_scriptdir}/plat-*/*.py[co]
+%{py_scriptdir}/plat-*/*.py*
%dir %{py_scriptdir}/bsddb
-%{py_scriptdir}/bsddb/*.py[co]
+%{py_scriptdir}/bsddb/*.py*
%dir %{py_scriptdir}/compiler
-%{py_scriptdir}/compiler/*.py[co]
+%{py_scriptdir}/compiler/*.py*
%dir %{py_scriptdir}/ctypes
%dir %{py_scriptdir}/ctypes/macholib
-%{py_scriptdir}/ctypes/*.py[co]
-%{py_scriptdir}/ctypes/macholib/*.py[co]
+%{py_scriptdir}/ctypes/*.py*
+%{py_scriptdir}/ctypes/macholib/*.py*
%dir %{py_scriptdir}/curses
-%{py_scriptdir}/curses/*.py[co]
+%{py_scriptdir}/curses/*.py*
%dir %{py_scriptdir}/distutils
%dir %{py_scriptdir}/distutils/command
-%{py_scriptdir}/distutils/*.py[co]
-%{py_scriptdir}/distutils/command/*.py[co]
+%{py_scriptdir}/distutils/*.py*
+%{py_scriptdir}/distutils/command/*.py*
%dir %{py_scriptdir}/email
%dir %{py_scriptdir}/email/mime
-%{py_scriptdir}/email/*.py[co]
-%{py_scriptdir}/email/mime/*.py[co]
+%{py_scriptdir}/email/*.py*
+%{py_scriptdir}/email/mime/*.py*
%dir %{py_scriptdir}/importlib
-%{py_scriptdir}/importlib/*.py[co]
+%{py_scriptdir}/importlib/*.py*
%dir %{py_scriptdir}/json
-%{py_scriptdir}/json/*.py[co]
+%{py_scriptdir}/json/*.py*
%dir %{py_scriptdir}/logging
-%{py_scriptdir}/logging/*.py[co]
+%{py_scriptdir}/logging/*.py*
%dir %{py_scriptdir}/multiprocessing
%dir %{py_scriptdir}/multiprocessing/dummy
-%{py_scriptdir}/multiprocessing/*.py[co]
-%{py_scriptdir}/multiprocessing/dummy/*.py[co]
+%{py_scriptdir}/multiprocessing/*.py*
+%{py_scriptdir}/multiprocessing/dummy/*.py*
%dir %{py_scriptdir}/unittest
-%{py_scriptdir}/unittest/*.py[co]
+%{py_scriptdir}/unittest/*.py*
%dir %{py_scriptdir}/unittest/test
-%{py_scriptdir}/unittest/test/*.py[co]
+%{py_scriptdir}/unittest/test/*.py*
%dir %{py_scriptdir}/wsgiref
-%{py_scriptdir}/wsgiref/*.py[co]
+%{py_scriptdir}/wsgiref/*.py*
%dir %{py_scriptdir}/xml
%dir %{py_scriptdir}/xml/dom
%dir %{py_scriptdir}/xml/etree
%dir %{py_scriptdir}/xml/parsers
%dir %{py_scriptdir}/xml/sax
-%{py_scriptdir}/xml/*.py[co]
-%{py_scriptdir}/xml/dom/*.py[co]
-%{py_scriptdir}/xml/etree/*.py[co]
-%{py_scriptdir}/xml/parsers/*.py[co]
-%{py_scriptdir}/xml/sax/*.py[co]
+%{py_scriptdir}/xml/*.py*
+%{py_scriptdir}/xml/dom/*.py*
+%{py_scriptdir}/xml/etree/*.py*
+%{py_scriptdir}/xml/parsers/*.py*
+%{py_scriptdir}/xml/sax/*.py*
%files modules-sqlite
%defattr(644,root,root,755)
%attr(755,root,root) %{py_dyndir}/_sqlite3.so
%dir %{py_scriptdir}/sqlite3
-%{py_scriptdir}/sqlite3/*.py[co]
+%{py_scriptdir}/sqlite3/*.py*
%files libs
%defattr(644,root,root,755)
@@ -879,29 +879,29 @@
%attr(755,root,root) %{py_dyndir}/_struct.so
# modules required by python library
-%{py_scriptdir}/_abcoll.py[co]
-%{py_scriptdir}/abc.py[co]
-%{py_scriptdir}/UserDict.py[co]
-%{py_scriptdir}/codecs.py[co]
-%{py_scriptdir}/copy_reg.py[co]
-%{py_scriptdir}/genericpath.py[co]
-%{py_scriptdir}/linecache.py[co]
-%{py_scriptdir}/locale.py[co]
-%{py_scriptdir}/posixpath.py[co]
-%{py_scriptdir}/re.py[co]
-%{py_scriptdir}/site.py[co]
-%{py_scriptdir}/sre_*.py[co]
-%{py_scriptdir}/stat.py[co]
-%{py_scriptdir}/sysconfig.py[co]
-%{py_scriptdir}/os.py[co]
-%{py_scriptdir}/_weakrefset.py[co]
+%{py_scriptdir}/_abcoll.py*
+%{py_scriptdir}/abc.py*
+%{py_scriptdir}/UserDict.py*
+%{py_scriptdir}/codecs.py*
+%{py_scriptdir}/copy_reg.py*
+%{py_scriptdir}/genericpath.py*
+%{py_scriptdir}/linecache.py*
+%{py_scriptdir}/locale.py*
+%{py_scriptdir}/posixpath.py*
+%{py_scriptdir}/re.py*
+%{py_scriptdir}/site.py*
+%{py_scriptdir}/sre_*.py*
+%{py_scriptdir}/stat.py*
+%{py_scriptdir}/sysconfig.py*
+%{py_scriptdir}/os.py*
+%{py_scriptdir}/_weakrefset.py*
# needed by the dynamic sys.lib patch
-%{py_scriptdir}/types.py[co]
-%{py_scriptdir}/warnings.py[co]
+%{py_scriptdir}/types.py*
+%{py_scriptdir}/warnings.py*
# encodings required by python library
%dir %{py_scriptdir}/encodings
-%{py_scriptdir}/encodings/*.py[co]
+%{py_scriptdir}/encodings/*.py*
# required by sysconfig.py
%dir %{py_libdir}/config
@@ -912,16 +912,16 @@
%files -n pydoc
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pydoc
-%{py_scriptdir}/pydoc.py[co]
+%{py_scriptdir}/pydoc.py*
%dir %{py_scriptdir}/pydoc_data
-%{py_scriptdir}/pydoc_data/*.py[co]
+%{py_scriptdir}/pydoc_data/*.py*
%files -n idle
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/idle
%dir %{py_scriptdir}/idlelib
%dir %{py_scriptdir}/idlelib/Icons
-%{py_scriptdir}/idlelib/*.py[co]
+%{py_scriptdir}/idlelib/*.py*
%{py_scriptdir}/idlelib/Icons/*
%{py_scriptdir}/idlelib/*.def
@@ -983,11 +983,11 @@
%attr(755,root,root) %{py_dyndir}/_hotshot.so
%dir %{py_scriptdir}/hotshot
-%{py_scriptdir}/hotshot/*.py[co]
-%{py_scriptdir}/pdb.py[co]
-%{py_scriptdir}/profile.py[co]
-%{py_scriptdir}/pstats.py[co]
-%{py_scriptdir}/timeit.py[co]
+%{py_scriptdir}/hotshot/*.py*
+%{py_scriptdir}/pdb.py*
+%{py_scriptdir}/profile.py*
+%{py_scriptdir}/pstats.py*
+%{py_scriptdir}/timeit.py*
%files 2to3
%defattr(644,root,root,755)
@@ -995,10 +995,10 @@
%dir %{py_scriptdir}/lib2to3
%dir %{py_scriptdir}/lib2to3/fixes
%dir %{py_scriptdir}/lib2to3/pgen2
-%{py_scriptdir}/lib2to3/*.py[co]
+%{py_scriptdir}/lib2to3/*.py*
%{py_scriptdir}/lib2to3/*.pickle
-%{py_scriptdir}/lib2to3/fixes/*.py[co]
-%{py_scriptdir}/lib2to3/pgen2/*.py[co]
+%{py_scriptdir}/lib2to3/fixes/*.py*
+%{py_scriptdir}/lib2to3/pgen2/*.py*
%files static
%defattr(644,root,root,755)
@@ -1032,6 +1032,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.387 2012/05/10 16:28:22 arekm
+- up to 2.7.3; include py files
+
Revision 1.386 2011/12/09 10:25:22 lisu
- rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/python/python-lib64.patch?r1=1.21&r2=1.22
http://cvs.pld-linux.org/packages/python/python-noarch_to_datadir.patch?r1=1.12&r2=1.13
http://cvs.pld-linux.org/packages/python/python-pythonpath.patch?r1=1.5&r2=1.6
http://cvs.pld-linux.org/packages/python/python.spec?r1=1.386&r2=1.387
More information about the pld-cvs-commit
mailing list