[python3: 11/11] Merge branch 'python3.3'

[dmalcolm]

commit 6a38560c1b0e6bfa3523ab73200af499e287dbdc
Merge: 9924024 48d2048
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Fri Aug 3 18:00:41 2012 -0400

    Merge branch 'python3.3'
    
    Conflicts:
    	python3.spec

 ...sts.patch => 00003-remove-mimeaudio-tests.patch |   16 +-
 00055-systemtap.patch                              |  912 ++++++++++++++++----
 00111-no-static-lib.patch                          |   18 +-
 00113-more-configuration-flags.patch               |   20 +-
 00114-statvfs-f_flag-constants.patch               |   26 +-
 00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch   |   22 +-
 00147-add-debug-malloc-stats.patch                 |  590 -------------
 00157-uid-gid-overflows.patch                      |  168 ++--
 00160-disable-test_fs_holes-in-rpm-build.patch     |   11 +
 00161-fix-test_tools-directory.patch               |   12 +
 00162-distutils-sysconfig-fix-CC-options.patch     |   14 +
 ...disable-parts-of-test_socket-in-rpm-build.patch |   11 +
 05000-autotool-intermediates.patch                 |  752 ++++++++++++++--
 ...3.2.3-lib64.patch => python-3.3.0b1-lib64.patch |   78 +-
 python3.spec                                       |  161 +++-
 sources                                            |    2 +-
 16 files changed, 1759 insertions(+), 1054 deletions(-)
---
diff --cc python3.spec
index 256e036,13ac725..5c6d8b2
--- a/python3.spec
+++ b/python3.spec
@@@ -1510,9 -1584,21 +1584,26 @@@ rm -fr %{buildroot
  # ======================================================
  
  %changelog
 -* Fri Jul 20 2012 David Malcolm <dmalcolm at redhat.com> - 3.3.0-0.1.b1
++* Fri Aug  3 2012 David Malcolm <dmalcolm at redhat.com> - 3.3.0-0.1.b1
+ - 3.2 -> 3.3: https://fedoraproject.org/wiki/Features/Python_3.3
+ - 3.3.0b1: refresh patches 3, 55, 102, 111, 113, 114, 134, 157; drop upstream
+ patch 147; regenenerate autotools patch; drop "--with-wide-unicode" from
+ configure (PEP 393); "plat-linux2" -> "plat-linux" (upstream issue 12326);
+ "bz2" -> "_bz2" and "crypt" -> "_crypt"; egg-info files are no longer shipped
+ for stdlib (upstream issues 10645 and 12218); email/test moved to
+ test/test_email; add /usr/bin/pyvenv[-3.3] and venv module (PEP 405); add
+ _decimal and _lzma modules; make collections modules explicit in payload again
+ (upstream issue 11085); add _testbuffer module to tests subpackage (added in
+ upstream commit 3f9b3b6f7ff0); fix test failures (patches 160 and 161);
+ workaround erroneously shared _sysconfigdata.py upstream issue #14774; fix
+ distutils.sysconfig traceback (patch 162); add BuildRequires: xz-devel (for
+ _lzma module); skip some tests within test_socket (patch 163)
+ 
 +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.3-11
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
++* Fri Jul 20 2012 David Malcolm <dmalcolm at redhat.com> - 3.3.0-0.1.b1
++
  * Fri Jun 22 2012 David Malcolm <dmalcolm at redhat.com> - 3.2.3-10
  - use macro for power64 (rhbz#834653)