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

[dmalcolm]

commit 72dcf3b6227ffeb687a202024d0d7749c1c5ea11
Merge: 0c0fcb4 28391cb
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Thu Sep 1 18:48:20 2011 -0400

    Merge branch 'master' into f16
    
    * Thu Sep  1 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-2.2
    - disable parts of test_io on ppc (rhbz#732998)
    - use "--findleaks --verbose" when running test suite
    - re-enable and fix the --with-tsc option on ppc64, and rework it on 32-bit
    ppc to avoid aliasing violations (patch 130; rhbz#698726)
    - add %%python3_version to the rpm macros (rhbz#719082)
    
    Conflicts:
    	python3.spec

 macros.python3                              |    1 +
 python-2.7.2-disable-tests-in-test_io.patch |   11 +++++
 python-2.7.2-tsc-on-ppc.patch               |   58 +++++++++++++++++++++++++++
 python3.spec                                |   33 +++++++++++++--
 4 files changed, 98 insertions(+), 5 deletions(-)
---
diff --cc python3.spec
index 1154209,5cbdd8c..a2b6d7f
--- a/python3.spec
+++ b/python3.spec
@@@ -118,7 -118,7 +118,7 @@@
  Summary: Version 3 of the Python programming language aka Python 3000
  Name: python3
  Version: %{pybasever}.1
- Release: 2.1%{?dist}
 -Release: 7%{?dist}
++Release: 2.2%{?dist}
  License: Python
  Group: Development/Languages
  
@@@ -1292,9 -1308,23 +1308,16 @@@ rm -fr %{buildroot
  # ======================================================
  
  %changelog
 -* Thu Sep  1 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-7
 -- run selftests with "--verbose"
++* Thu Sep  1 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-2.2
+ - disable parts of test_io on ppc (rhbz#732998)
 -
 -* Wed Aug 31 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-6
 -- use "--findleaks --verbose3" when running test suite
 -
 -* Tue Aug 23 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-5
++- use "--findleaks --verbose" when running test suite
+ - re-enable and fix the --with-tsc option on ppc64, and rework it on 32-bit
+ ppc to avoid aliasing violations (patch 130; rhbz#698726)
++- add %%python3_version to the rpm macros (rhbz#719082)
+ 
 -* Tue Aug 23 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-4
 +* Tue Aug 23 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-2.1
  - don't use --with-tsc on ppc64 debug builds (rhbz#698726)
  
 -* Thu Aug 18 2011 David Malcolm <dmalcolm at redhat.com> - 3.2.1-3
 -- add %%python3_version to the rpm macros (rhbz#719082)
 -
  * Mon Jul 11 2011 Dennis Gilmore <dennis at ausil.us> - 3.2.1-2
  - disable some tests on sparc arches