From 6b34963600c2b8962f556ceeb3d254274770f6ba Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 4 May 2012 15:24:50 -0400 Subject: [PATCH] add markers to make it easier to diff python.spec and python3.spec --- python3.spec | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/python3.spec b/python3.spec index a31e752..bfa9de8 100644 --- a/python3.spec +++ b/python3.spec @@ -221,6 +221,7 @@ Patch1: Python-3.1.1-rpath.patch # It's simplest to remove them: Patch3: python-3.2b2-remove-mimeaudio-tests.patch +# 00055 # # Systemtap support: add statically-defined probe points # Patch based on upstream bug: http://bugs.python.org/issue4111 # fixed up by mjw and wcohen for 2.6.2, then fixed up by dmalcolm for 2.6.4 @@ -230,27 +231,33 @@ Patch55: 00055-systemtap.patch Patch102: python-3.2.3-lib64.patch +# 00104 # # Only used when "%{_lib}" == "lib64" # Another lib64 fix, for distutils/tests/test_install.py; not upstream: Patch104: 00104-lib64-fix-for-test_install.patch +# 00111 # # Patch the Makefile.pre.in so that the generated Makefile doesn't try to build # a libpythonMAJOR.MINOR.a (bug 550692): Patch111: 00111-no-static-lib.patch +# 00112 # # Patch112: python-2.7rc1-debug-build.patch: this is not relevant to Python 3, # for 3.2 onwards +# 00113 # # Add configure-time support for the COUNT_ALLOCS and CALL_PROFILE options # described at http://svn.python.org/projects/python/trunk/Misc/SpecialBuilds.txt # so that if they are enabled, they will be in that build's pyconfig.h, so that # extension modules will reliably use them Patch113: 00113-more-configuration-flags.patch +# 00114 # # Add flags for statvfs.f_flag to the constant list in posixmodule (i.e. "os") # (rhbz:553020); partially upstream as http://bugs.python.org/issue7647 Patch114: 00114-statvfs-f_flag-constants.patch +# 00125 # # COUNT_ALLOCS is useful for debugging, but the upstream behaviour of always # emitting debug info to stdout on exit is too verbose and makes it harder to # use the debug build. Add a "PYTHONDUMPCOUNTS" environment variable which @@ -269,16 +276,19 @@ Patch125: 00125-less-verbose-COUNT_ALLOCS.patch # Not yet sent upstream Patch129: python-3.2.1-fix-test-subprocess-with-nonreadable-path-dir.patch +# 00130 # # Python 2's: # Patch130: python-2.7.2-add-extension-suffix-to-python-config.patch # is not relevant to Python 3 (for 3.2 onwards) +# 00131 # # The four tests in test_io built on top of check_interrupted_write_retry # fail when built in Koji, for ppc and ppc64; for some reason, the SIGALRM # handlers are never called, and the call to write runs to completion # (rhbz#732998) Patch131: 00131-disable-tests-in-test_io.patch +# 00132 # # Add non-standard hooks to unittest for use in the "check" phase below, when # running selftests within the build: # @unittest._skipInRpmBuild(reason) @@ -292,55 +302,69 @@ Patch131: 00131-disable-tests-in-test_io.patch # these unittest hooks in their own "check" phases) Patch132: 00132-add-rpmbuild-hooks-to-unittest.patch +# 00133 # # 00133-skip-test_dl.patch is not relevant for python3: the "dl" module no # longer exists +# 00134 # # Fix a failure in test_sys.py when configured with COUNT_ALLOCS enabled # Not yet sent upstream Patch134: 00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch +# 00135 # # test_weakref's test_callback_in_cycle_resurrection doesn't work with # COUNT_ALLOCS, as the metrics keep "C" alive. Work around this for our # debug build: # Not yet sent upstream Patch135: 00135-fix-test-within-test_weakref-in-debug-build.patch +# 00136 # # Patch136: 00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch does not seem # to be needed by python3 +# 00137 # # Some tests within distutils fail when run in an rpmbuild: Patch137: 00137-skip-distutils-tests-that-fail-in-rpmbuild.patch +# 00138 # # Patch138: 00138-fix-distutils-tests-in-debug-build.patch is not relevant for # python3 +# 00139 # # ARM-specific: skip known failure in test_float: # http://bugs.python.org/issue8265 (rhbz#706253) Patch139: 00139-skip-test_float-known-failure-on-arm.patch +# 00140 # # Patch140: 00140-skip-test_ctypes-known-failure-on-sparc.patch does not appear # to be relevant for python3 +# 00141 # # Fix test_gc's test_newinstance case when configured with COUNT_ALLOCS: Patch141: 00141-fix-test_gc_with_COUNT_ALLOCS.patch +# 00142 # # Some pty tests fail when run in mock (rhbz#714627): Patch142: 00142-skip-failing-pty-tests-in-rpmbuild.patch +# 00143 # # Fix the --with-tsc option on ppc64, and rework it on 32-bit ppc to avoid # aliasing violations (rhbz#698726) # Sent upstream as http://bugs.python.org/issue12872 Patch143: 00143-tsc-on-ppc.patch +# 00144 # # (Optionally) disable the gdbm module: # python.spec's # Patch144: 00144-no-gdbm.patch # is not needed in python3.spec +# 00145 # # python.spec's # Patch145: 00145-force-sys-platform-to-be-linux2.patch # is upstream for Python 3 as of 3.2.2 +# 00146 # # Support OpenSSL FIPS mode (e.g. when OPENSSL_FORCE_FIPS_MODE=1 is set) # - handle failures from OpenSSL (e.g. on attempts to use MD5 in a # FIPS-enforcing environment) @@ -357,43 +381,53 @@ Patch143: 00143-tsc-on-ppc.patch # (rhbz#563986) Patch146: 00146-hashlib-fips.patch +# 00147 # # Add a sys._debugmallocstats() function # Based on patch 202 from RHEL 5's python.spec, with updates from rhbz#737198 # Not yet sent upstream Patch147: 00147-add-debug-malloc-stats.patch +# 00148 # # Upstream as of Python 3.2.3: # Patch148: 00148-gdbm-1.9-magic-values.patch +# 00149 # # Upstream as of Python 3.2.3: # Patch149: 00149-backport-issue11254-pycache-bytecompilation-fix.patch +# 00150 # # 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 # the patch mentioned here: # http://sourceware.org/bugzilla/show_bug.cgi?id=13472 Patch150: 00150-disable-rAssertAlmostEqual-cmath-on-ppc.patch +# 00151 # # python.spec had: # Patch151: 00151-fork-deadlock.patch +# 00152 # # 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 +# 00153 # # 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@entry" rather than just "v": Patch153: 00153-fix-test_gdb-noise.patch +# 00154 # # python3.spec on f15 has: # Patch154: 00154-skip-urllib-test-requiring-working-DNS.patch +# 00155 # # Avoid allocating thunks in ctypes unless absolutely necessary, to avoid # generating SELinux denials on "import ctypes" and "import uuid" when # embedding Python within httpd (rhbz#814391) Patch155: 00155-avoid-ctypes-thunks.patch +# 00156 # # Recent builds of gdb will only auto-load scripts from certain safe # locations. Turn off this protection when running test_gdb in the selftest # suite to ensure that it can load our -gdb.py script (rhbz#817072):