[python/f16: 8/8] Merge branch 'master' into f16

[dmalcolm]

commit 1e06160ce665a8500d35e8f7e736793187157e52
Merge: 0be4d5a e252525
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Thu Sep 1 18:16:50 2011 -0400

    Merge branch 'master' into f16
    
    * Thu Sep  1 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-4.2
    - run selftests with "--verbose"
    - disable parts of test_io on ppc (rhbz#732998)
    - add --extension-suffix option to python-config (patch 130; rhbz#732808)
    - reenable and fix the --with-tsc option on ppc64, and rework it on 32-bit
    ppc to avoid aliasing violations (patch 129; rhbz#698726)
    - add rpm macros file (rhbz#731800)
    
    Conflicts:
    	python.spec

 macros.python2                                     |    4 +
 ...7.2-add-extension-suffix-to-python-config.patch |   18 ++++++
 python-2.7.2-disable-tests-in-test_io.patch        |   11 ++++
 python-2.7.2-tsc-on-ppc.patch                      |   58 +++++++++++++++++++
 python.spec                                        |   61 ++++++++++++++++++--
 5 files changed, 146 insertions(+), 6 deletions(-)
---
diff --cc python.spec
index af2f5b1,fbc987e..96bc0bb
--- a/python.spec
+++ b/python.spec
@@@ -102,7 -102,7 +102,7 @@@ Summary: An interpreted, interactive, o
  Name: %{python}
  # Remember to also rebase python-docs when changing this:
  Version: 2.7.2
- Release: 4.1%{?dist}
 -Release: 9%{?dist}
++Release: 4.2%{?dist}
  License: Python
  Group: Development/Languages
  Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@@ -1765,9 -1806,23 +1806,17 @@@ rm -fr %{buildroot
  # ======================================================
  
  %changelog
 -* Thu Sep  1 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-9
++* Thu Sep  1 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-4.2
+ - run selftests with "--verbose"
+ - disable parts of test_io on ppc (rhbz#732998)
 -
 -* Tue Aug 23 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-8
+ - add --extension-suffix option to python-config (patch 130; rhbz#732808)
 -
 -* Tue Aug 23 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-7
 -- re-enable and fix the --with-tsc option on ppc64, and rework it on 32-bit
++- reenable and fix the --with-tsc option on ppc64, and rework it on 32-bit
+ ppc to avoid aliasing violations (patch 129; rhbz#698726)
++- add rpm macros file (rhbz#731800)
+ 
 -* Tue Aug 23 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-6
 +* Tue Aug 23 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-4.1
  - don't use --with-tsc on ppc64 debug builds (rhbz#698726)
  
 -* Thu Aug 18 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-5
 -- add rpm macros file (rhbz#731800)
 -
  * Fri Jul  8 2011 David Malcolm <dmalcolm at redhat.com> - 2.7.2-4
  - cleanup of BuildRequires; add comment headings to specfile sections