[python3/f16] 3.2.3-1
dmalcolm
dmalcolm at fedoraproject.org
Thu Apr 12 16:35:21 UTC 2012
commit c38e0b5fd0f47029e1c4809123d7f5a389c1c471
Author: David Malcolm <dmalcolm at redhat.com>
Date: Thu Apr 12 12:34:26 2012 -0400
3.2.3-1
* Thu Apr 12 2012 David Malcolm <dmalcolm at redhat.com> - 3.2.3-1
- 3.2.3; refresh patch 102 (lib64); fix test_gdb (patches 152 and 153)
.gitignore | 1 +
00152-fix-test-gdb-regex.patch | 11 ++++
00153-fix-test_gdb-noise.patch | 35 +++++++++++
...n-3.2.1-lib64.patch => python-3.2.3-lib64.patch | 60 ++++++++++----------
python3.spec | 21 ++++++-
sources | 2 +-
6 files changed, 96 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7844dc9..91046c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ Python-3.2a1.tar.bz2
/Python-3.2rc3.tar.bz2
/Python-3.2.tar.bz2
/Python-3.2.1.tar.bz2
+/Python-3.2.3.tar.bz2
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/00153-fix-test_gdb-noise.patch b/00153-fix-test_gdb-noise.patch
new file mode 100644
index 0000000..bc5ee63
--- /dev/null
+++ b/00153-fix-test_gdb-noise.patch
@@ -0,0 +1,35 @@
+--- Lib/test/test_gdb.py.old 2012-04-11 21:04:01.367073855 -0400
++++ Lib/test/test_gdb.py 2012-04-12 08:52:58.320288761 -0400
+@@ -96,6 +96,15 @@ class DebuggerTests(unittest.TestCase):
+ # Generate a list of commands in gdb's language:
+ commands = ['set breakpoint pending yes',
+ 'break %s' % breakpoint,
++
++ # GDB as of Fedora 17 onwards can distinguish between the
++ # value of a variable at entry vs current value:
++ # http://sourceware.org/gdb/onlinedocs/gdb/Variables.html
++ # which leads to the selftests failing with errors like this:
++ # AssertionError: 'v at entry=()' != '()'
++ # Disable this:
++ 'set print entry-values no',
++
+ 'run']
+ if cmds_after_breakpoint:
+ commands += cmds_after_breakpoint
+@@ -135,8 +144,16 @@ class DebuggerTests(unittest.TestCase):
+ err = err.replace("warning: Cannot initialize thread debugging"
+ " library: Debugger service failed\n",
+ '')
++ err = '\n'.join([line
++ for line in err.splitlines()
++ if not line.startswith('warning: Unable to open')
++ if not line.startswith('Missing separate debuginfo for')
++ if not line.startswith('Try: yum --disablerepo=')
++ # In case 'set print entry-values no' failed:
++ if not line.startswith('Undefined set print command')])
+
+ # Ensure no unexpected error messages:
++ self.maxDiff = None
+ self.assertEqual(err, '')
+
+ return out
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 ee9b319..c6b84bc 100644
--- a/python3.spec
+++ b/python3.spec
@@ -117,8 +117,8 @@
# ==================
Summary: Version 3 of the Python programming language aka Python 3000
Name: python3
-Version: %{pybasever}.1
-Release: 4%{?dist}
+Version: %{pybasever}.3
+Release: 1%{?dist}
License: Python
Group: Development/Languages
@@ -222,7 +222,7 @@ Patch6: python-3.2.1-no-static-lib.patch
# dmalcolm
Patch8: python-3.2b2-systemtap.patch
-Patch102: python-3.2.1-lib64.patch
+Patch102: python-3.2.3-lib64.patch
# Add configure-time support for the COUNT_ALLOCS and CALL_PROFILE options
# described at http://svn.python.org/projects/python/trunk/Misc/SpecialBuilds.txt
@@ -277,6 +277,15 @@ Patch130: python-2.7.2-tsc-on-ppc.patch
# (rhbz#732998)
Patch131: python-2.7.2-disable-tests-in-test_io.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
+
+# Strip out lines of the form "warning: Unable to open ..." from gdb's stderr
+# when running test_gdb.py; also cope with change to gdb in F17 onwards in
+# which values are printed as "v at entry" rather than just "v":
+Patch153: 00153-fix-test_gdb-noise.patch
+
# This is the generated patch to "configure"; see the description of
# %{regenerate_autotooling_patch}
# above:
@@ -441,6 +450,9 @@ rm -r Modules/zlib || exit 1
%patch131 -p1
%endif
+%patch152 -p0
+%patch153 -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.
#
@@ -1318,6 +1330,9 @@ rm -fr %{buildroot}
# ======================================================
%changelog
+* Thu Apr 12 2012 David Malcolm <dmalcolm at redhat.com> - 3.2.3-1
+- 3.2.3; refresh patch 102 (lib64); fix test_gdb (patches 152 and 153)
+
* Thu Feb 9 2012 Thomas Spura <tomspur at fedoraproject.org> - 3.2.1-4
- use newly installed python for byte compiling (now for real)
diff --git a/sources b/sources
index b583b29..ed93ba8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0869ba3f3797aacb1f954ef24c256f3 Python-3.2.1.tar.bz2
+cea34079aeb2e21e7b60ee82a0ac286b Python-3.2.3.tar.bz2
More information about the scm-commits
mailing list