[python3] 3.2.3-1
dmalcolm
dmalcolm at fedoraproject.org
Thu Apr 12 00:21:36 UTC 2012
commit 28856627bf7413e17d327d7b3a840a7a4122b795
Author: David Malcolm <dmalcolm at redhat.com>
Date: Wed Apr 11 20:20:08 2012 -0400
3.2.3-1
* Wed Apr 11 2012 David Malcolm <dmalcolm at redhat.com> - 3.2.3-1
- 3.2.3; refresh patch 102 (lib64); drop upstream patches 148 (gdbm magic
values), 149 (__pycache__ fix); add patch 152 (test_gdb regex)
00148-gdbm-1.9-magic-values.patch | 13 --
...rt-issue11254-pycache-bytecompilation-fix.patch | 146 --------------------
00152-fix-test-gdb-regex.patch | 11 ++
...n-3.2.1-lib64.patch => python-3.2.3-lib64.patch | 60 ++++----
python3.spec | 35 +++--
sources | 2 +-
6 files changed, 65 insertions(+), 202 deletions(-)
---
diff --git a/00152-fix-test-gdb-regex.patch b/00152-fix-test-gdb-regex.patch
new file mode 100644
index 0000000..4e31c2e
--- /dev/null
+++ b/00152-fix-test-gdb-regex.patch
@@ -0,0 +1,11 @@
+--- Lib/test/test_gdb.py.old 2012-04-11 19:35:13.512681203 -0400
++++ Lib/test/test_gdb.py 2012-04-11 19:39:52.567192540 -0400
+@@ -159,7 +159,7 @@ class DebuggerTests(unittest.TestCase):
+ # gdb can insert additional '\n' and space characters in various places
+ # in its output, depending on the width of the terminal it's connected
+ # to (using its "wrap_here" function)
+- m = re.match('.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+Python/bltinmodule.c.*',
++ m = re.match('.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*',
+ gdb_output, re.DOTALL)
+ if not m:
+ self.fail('Unexpected gdb output: %r\n%s' % (gdb_output, gdb_output))
diff --git a/python-3.2.1-lib64.patch b/python-3.2.3-lib64.patch
similarity index 79%
rename from python-3.2.1-lib64.patch
rename to python-3.2.3-lib64.patch
index 8b15e3e..5c3cf13 100644
--- a/python-3.2.1-lib64.patch
+++ b/python-3.2.3-lib64.patch
@@ -1,7 +1,7 @@
-diff -up Python-3.2.1/Lib/distutils/command/install.py.lib64 Python-3.2.1/Lib/distutils/command/install.py
---- Python-3.2.1/Lib/distutils/command/install.py.lib64 2011-07-09 02:58:46.000000000 -0400
-+++ Python-3.2.1/Lib/distutils/command/install.py 2011-07-11 11:20:45.980426001 -0400
-@@ -47,14 +47,14 @@ else:
+diff -up Python-3.2.3/Lib/distutils/command/install.py.lib64 Python-3.2.3/Lib/distutils/command/install.py
+--- Python-3.2.3/Lib/distutils/command/install.py.lib64 2012-04-11 02:54:02.000000000 -0400
++++ Python-3.2.3/Lib/distutils/command/install.py 2012-04-11 19:01:19.727107020 -0400
+@@ -45,14 +45,14 @@ else:
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
@@ -18,10 +18,10 @@ diff -up Python-3.2.1/Lib/distutils/command/install.py.lib64 Python-3.2.1/Lib/di
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
-diff -up Python-3.2.1/Lib/distutils/sysconfig.py.lib64 Python-3.2.1/Lib/distutils/sysconfig.py
---- Python-3.2.1/Lib/distutils/sysconfig.py.lib64 2011-07-09 02:58:47.000000000 -0400
-+++ Python-3.2.1/Lib/distutils/sysconfig.py 2011-07-11 11:20:45.981426001 -0400
-@@ -124,8 +124,12 @@ def get_python_lib(plat_specific=0, stan
+diff -up Python-3.2.3/Lib/distutils/sysconfig.py.lib64 Python-3.2.3/Lib/distutils/sysconfig.py
+--- Python-3.2.3/Lib/distutils/sysconfig.py.lib64 2012-04-11 02:54:02.000000000 -0400
++++ Python-3.2.3/Lib/distutils/sysconfig.py 2012-04-11 19:01:19.727107020 -0400
+@@ -122,8 +122,12 @@ def get_python_lib(plat_specific=0, stan
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
@@ -35,9 +35,9 @@ diff -up Python-3.2.1/Lib/distutils/sysconfig.py.lib64 Python-3.2.1/Lib/distutil
if standard_lib:
return libpython
else:
-diff -up Python-3.2.1/Lib/site.py.lib64 Python-3.2.1/Lib/site.py
---- Python-3.2.1/Lib/site.py.lib64 2011-07-09 02:58:49.000000000 -0400
-+++ Python-3.2.1/Lib/site.py 2011-07-11 11:20:45.982426001 -0400
+diff -up Python-3.2.3/Lib/site.py.lib64 Python-3.2.3/Lib/site.py
+--- Python-3.2.3/Lib/site.py.lib64 2012-04-11 02:54:03.000000000 -0400
++++ Python-3.2.3/Lib/site.py 2012-04-11 19:01:19.728107008 -0400
@@ -285,12 +285,16 @@ def getsitepackages():
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -55,9 +55,9 @@ diff -up Python-3.2.1/Lib/site.py.lib64 Python-3.2.1/Lib/site.py
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
-diff -up Python-3.2.1/Lib/sysconfig.py.lib64 Python-3.2.1/Lib/sysconfig.py
---- Python-3.2.1/Lib/sysconfig.py.lib64 2011-07-09 02:58:49.000000000 -0400
-+++ Python-3.2.1/Lib/sysconfig.py 2011-07-11 11:20:45.982426001 -0400
+diff -up Python-3.2.3/Lib/sysconfig.py.lib64 Python-3.2.3/Lib/sysconfig.py
+--- Python-3.2.3/Lib/sysconfig.py.lib64 2012-04-11 02:54:03.000000000 -0400
++++ Python-3.2.3/Lib/sysconfig.py 2012-04-11 19:01:19.728107008 -0400
@@ -21,10 +21,10 @@ __all__ = [
_INSTALL_SCHEMES = {
@@ -86,13 +86,13 @@ diff -up Python-3.2.1/Lib/sysconfig.py.lib64 Python-3.2.1/Lib/sysconfig.py
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
-diff -up Python-3.2.1/Lib/test/test_site.py.lib64 Python-3.2.1/Lib/test/test_site.py
---- Python-3.2.1/Lib/test/test_site.py.lib64 2011-07-09 02:58:51.000000000 -0400
-+++ Python-3.2.1/Lib/test/test_site.py 2011-07-11 11:20:45.983426001 -0400
-@@ -222,12 +222,15 @@ class HelperFunctionsTests(unittest.Test
- wanted = os.path.join('xoxo', 'Lib', 'site-packages')
- self.assertEqual(dirs[0], wanted)
+diff -up Python-3.2.3/Lib/test/test_site.py.lib64 Python-3.2.3/Lib/test/test_site.py
+--- Python-3.2.3/Lib/test/test_site.py.lib64 2012-04-11 02:54:05.000000000 -0400
++++ Python-3.2.3/Lib/test/test_site.py 2012-04-11 19:02:01.413585869 -0400
+@@ -236,12 +236,15 @@ class HelperFunctionsTests(unittest.Test
+ self.assertEqual(dirs[2], wanted)
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],
+ self.assertEqual(len(dirs), 3)
@@ -106,11 +106,11 @@ diff -up Python-3.2.1/Lib/test/test_site.py.lib64 Python-3.2.1/Lib/test/test_sit
+ wanted = os.path.join('xoxo', 'lib', 'site-python')
+ self.assertEqual(dirs[2], wanted)
else:
+ # other platforms
self.assertEqual(len(dirs), 2)
- self.assertEqual(dirs[0], 'xoxo')
-diff -up Python-3.2.1/Makefile.pre.in.lib64 Python-3.2.1/Makefile.pre.in
---- Python-3.2.1/Makefile.pre.in.lib64 2011-07-11 11:20:45.974426000 -0400
-+++ Python-3.2.1/Makefile.pre.in 2011-07-11 11:20:45.984426001 -0400
+diff -up Python-3.2.3/Makefile.pre.in.lib64 Python-3.2.3/Makefile.pre.in
+--- Python-3.2.3/Makefile.pre.in.lib64 2012-04-11 19:01:19.722107084 -0400
++++ Python-3.2.3/Makefile.pre.in 2012-04-11 19:01:19.729106996 -0400
@@ -106,7 +106,7 @@ LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
@@ -120,9 +120,9 @@ diff -up Python-3.2.1/Makefile.pre.in.lib64 Python-3.2.1/Makefile.pre.in
ABIFLAGS= @ABIFLAGS@
# Detailed destination directories
-diff -up Python-3.2.1/Modules/getpath.c.lib64 Python-3.2.1/Modules/getpath.c
---- Python-3.2.1/Modules/getpath.c.lib64 2011-07-09 02:58:54.000000000 -0400
-+++ Python-3.2.1/Modules/getpath.c 2011-07-11 11:27:44.596425999 -0400
+diff -up Python-3.2.3/Modules/getpath.c.lib64 Python-3.2.3/Modules/getpath.c
+--- Python-3.2.3/Modules/getpath.c.lib64 2012-04-11 02:54:07.000000000 -0400
++++ Python-3.2.3/Modules/getpath.c 2012-04-11 19:01:19.729106996 -0400
@@ -122,8 +122,8 @@
#endif
@@ -161,9 +161,9 @@ diff -up Python-3.2.1/Modules/getpath.c.lib64 Python-3.2.1/Modules/getpath.c
}
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
-diff -up Python-3.2.1/setup.py.lib64 Python-3.2.1/setup.py
---- Python-3.2.1/setup.py.lib64 2011-07-09 02:58:56.000000000 -0400
-+++ Python-3.2.1/setup.py 2011-07-11 11:28:00.193426004 -0400
+diff -up Python-3.2.3/setup.py.lib64 Python-3.2.3/setup.py
+--- Python-3.2.3/setup.py.lib64 2012-04-11 02:54:08.000000000 -0400
++++ Python-3.2.3/setup.py 2012-04-11 19:01:19.730106984 -0400
@@ -396,7 +396,7 @@ class PyBuildExt(build_ext):
# Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue
diff --git a/python3.spec b/python3.spec
index 46112d6..695cd60 100644
--- a/python3.spec
+++ b/python3.spec
@@ -121,8 +121,8 @@
# ==================
Summary: Version 3 of the Python programming language aka Python 3000
Name: python3
-Version: %{pybasever}.2
-Release: 13%{?dist}
+Version: %{pybasever}.3
+Release: 1%{?dist}
License: Python
Group: Development/Languages
@@ -224,7 +224,7 @@ Patch3: python-3.2b2-remove-mimeaudio-tests.patch
# dmalcolm
Patch55: 00055-systemtap.patch
-Patch102: python-3.2.1-lib64.patch
+Patch102: python-3.2.3-lib64.patch
# Only used when "%{_lib}" == "lib64"
# Another lib64 fix, for distutils/tests/test_install.py; not upstream:
@@ -358,14 +358,11 @@ Patch146: 00146-hashlib-fips.patch
# Not yet sent upstream
Patch147: 00147-add-debug-malloc-stats.patch
-# Cherrypick fix for dbm version detection to cope with gdbm-1.9's magic values
-# Taken from upstream http://bugs.python.org/issue13007 (rhbz#742242)
-Patch148: 00148-gdbm-1.9-magic-values.patch
+# Upstream as of Python 3.2.3:
+# Patch148: 00148-gdbm-1.9-magic-values.patch
-# Cherrypick fix for distutils not using __pycache__ when byte-compiling files
-# Based on upstream http://bugs.python.org/issue11254 (rhbz#722578)
-# (upstream commits 27a36b05caed and 651e84363001):
-Patch149: 00149-backport-issue11254-pycache-bytecompilation-fix.patch
+# Upstream as of Python 3.2.3:
+# Patch149: 00149-backport-issue11254-pycache-bytecompilation-fix.patch
# temporarily disable rAssertAlmostEqual in test_cmath on PPC (bz #750811)
# caused by a glibc bug. This patch can be removed when we have a glibc with
@@ -373,6 +370,14 @@ Patch149: 00149-backport-issue11254-pycache-bytecompilation-fix.patch
# http://sourceware.org/bugzilla/show_bug.cgi?id=13472
Patch150: 00150-disable-rAssertAlmostEqual-cmath-on-ppc.patch
+# python.spec had:
+# Patch151: 00151-fork-deadlock.patch
+
+# Fix a regex in test_gdb so that it doesn't choke when gdb provides a full
+# path to Python/bltinmodule.c:
+Patch152: 00152-fix-test-gdb-regex.patch
+
+
# (New patches go here ^^^)
#
# When adding new patches to "python" and "python3" in Fedora 17 onwards,
@@ -583,11 +588,13 @@ done
# 00145: not for python3
%patch146 -p1
%patch147 -p1
-%patch148 -p1
-%patch149 -p1
+# 00148: upstream as of Python 3.2.3
+# 00149: upstream as of Python 3.2.3
%ifarch ppc ppc64
%patch150 -p1
%endif
+# 00151: not for python3
+%patch152 -p0
# Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
# are many differences between 2.6 and the Python 3 library.
@@ -1410,6 +1417,10 @@ rm -fr %{buildroot}
# ======================================================
%changelog
+* Wed Apr 11 2012 David Malcolm <dmalcolm at redhat.com> - 3.2.3-1
+- 3.2.3; refresh patch 102 (lib64); drop upstream patches 148 (gdbm magic
+values), 149 (__pycache__ fix); add patch 152 (test_gdb regex)
+
* Thu Feb 9 2012 Thomas Spura <tomspur at fedoraproject.org> - 3.2.2-13
- use newly installed python for byte compiling (now for real)
diff --git a/sources b/sources
index fd9f0fc..9d0aae5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3720ce9460597e49264bbb63b48b946d Python-3.2.2.tar.xz
+187564726f2c1473d301c586acc24847 Python-3.2.3.tar.xz
More information about the scm-commits
mailing list