[python] minor fixes to reduce python/python3 delta

dmalcolm dmalcolm at fedoraproject.org
Sat Sep 10 12:25:30 UTC 2011


commit bbbca2ccff122d4e4920f2db11c91f80dcb38063
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Sat Sep 10 08:24:34 2011 -0400

    minor fixes to reduce python/python3 delta
    
    Rename patch 300 to the name used in python3.spec

 ...rmediates.patch => autotool-intermediates.patch |    0
 python.spec                                        |    5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/python-2.7-autotool-intermediates.patch b/autotool-intermediates.patch
similarity index 100%
rename from python-2.7-autotool-intermediates.patch
rename to autotool-intermediates.patch
diff --git a/python.spec b/python.spec
index 30eb36a..c2b6cb9 100644
--- a/python.spec
+++ b/python.spec
@@ -580,7 +580,7 @@ Patch142: 00142-skip-failing-pty-tests-in-rpmbuild.patch
 # This is the generated patch to "configure"; see the description of
 #   %{regenerate_autotooling_patch}
 # above:
-Patch300: python-2.7-autotool-intermediates.patch
+Patch300: autotool-intermediates.patch
 
 # ======================================================
 # Additional metadata, and subpackages
@@ -1285,7 +1285,7 @@ CheckPython() {
   fi
 %endif
 
-  # Actually invoke regrtest.py, setting "WITHIN_PYTHON_RPM_BUILD" so that the
+  # Run the upstream test suite, setting "WITHIN_PYTHON_RPM_BUILD" so that the
   # our non-standard decorators take effect on the relevant tests:
   #   @unittest._skipInRpmBuild(reason)
   #   @unittest._expectedFailureInRpmBuild
@@ -1645,7 +1645,6 @@ rm -fr %{buildroot}
 
 %endif # with_debug_build
 
-
 # We put the debug-gdb.py file inside /usr/lib/debug to avoid noise from
 # ldconfig (rhbz:562980).
 # 


More information about the scm-commits mailing list