[python3/nightly: 9/9] Merge branch 'master' into nightly

[Miro Hrončok]

commit d9f0c430ff5c37bf2aaeee8e572e51879b15f99c
Merge: d205ffd 8430e60
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Fri Jul 11 20:25:48 2014 +0200

    Merge branch 'master' into nightly
    
    Conflicts:
    	python3.spec

 00189-add-rewheel-module.patch |    6 +++---
 python3.spec                   |   26 +++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)
---
diff --cc python3.spec
index ebeddc8,2596e4f..3bff6e5
--- a/python3.spec
+++ b/python3.spec
@@@ -1,17 -1,25 +1,29 @@@
  # ======================================================
  # Conditionals and other variables controlling the build
  # ======================================================
 +%{!?scl:%global pkg_name %{name}}
 +%{?scl:%scl_package python3}
 +# Turn off default SCL bytecompiling.
 +%{?scl:%global _turn_off_bytecompile 1}
  
+ # NOTES ON BOOTSTRAPING PYTHON 3.4:
+ #
+ # Due to dependency cycle between Python, pip, setuptools and
+ # wheel caused by the rewheel patch, one has to build in the
+ # following order:
+ #
+ # 1) python3 with with_rewheel set to 0
+ # 2) python3-setuptools and python3-pip with with_rewheel set to 0
+ # 3) python3-wheel
+ # 4) python3-setuptools and python3-pip with with_rewheel set to 1
+ # 5) python3 with with_rewheel set to 1
+ 
  %global with_rewheel 1
  
 -%global pybasever 3.4
 +%global pybasever 3.5
  
  # pybasever without the dot:
 -%global pyshortver 34
 +%global pyshortver 35
  
  %global pylibdir %{_libdir}/python%{pybasever}
  %global dynload_dir %{pylibdir}/lib-dynload
@@@ -1897,52 -1853,18 +1909,64 @@@ rm -fr %{buildroot
  # ======================================================
  
  %changelog
 +* Thu Jul 03 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.15.20140703hg1492a42b8308
 +- Update to hg: 1492a42b8308
 +
 +* Wed Jul 02 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.14.20140702hg438da6ae38fa
 +- Update to hg: 438da6ae38fa
 +
 +* Tue Jul 01 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.13.20140701hg2e0a98178c07
 +- Update to hg: 2e0a98178c07
 +
 +* Tue Jul 01 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.12.20140701hg669b43bffd87
 +- Update to hg: 669b43bffd87
 +
 +* Mon Jun 30 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.11.20140630hg2d0fa8f383c8
 +- Update to hg: 2d0fa8f383c8
 +
 +* Mon Jun 30 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.10.20140630hg3b5279b5bfd1
 +- Update to hg: 3b5279b5bfd1
 +
 +* Sun Jun 29 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.9.20140629hg394e6bda5a70
 +- Update to hg: 394e6bda5a70
 +
 +* Sun Jun 29 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.8.20140629hg54f94e753269
 +- Update to hg: 54f94e753269
 +
 +* Sat Jun 28 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.7.20140628hg6dd4c2d30b0e
 +- Update to hg: 6dd4c2d30b0e
 +
 +* Sat Jun 28 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.6.20140628hg8552f3031753
 +- Update to hg: 8552f3031753
 +
 +* Sat Jun 28 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.5.20140628hg26287c059304
 +- Update to hg: 26287c059304
 +
 +* Fri Jun 27 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.4.20140626hg3151f6f9df85
 +- Bootstrapping
 +
 +* Thu Jun 26 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.3.20140626hg3151f6f9df85
 +- Update to hg: 3151f6f9df85
 +
 +* Wed Jun 25 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.2.20140625hgb4130b2f7748
 +- Update to hg: b4130b2f7748
 +
 +* Wed Jun 18 2014 Miro Hrončok <mhroncok at redhat.com> - 3.5.0-0.1.20140618hg1e74350dd056
 +- Update to hg: 1e74350dd0561
 +- Use SCL
 +
+ * Sun Jun  8 2014 Peter Robinson <pbrobinson at fedoraproject.org> 3.4.1-12
+ - aarch64 has valgrind, just list those that don't support it
+ 
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.1-11
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Wed Jun 04 2014 Karsten Hopp <karsten at redhat.com> 3.4.1-10
+ - bump release and rebuild to link with the correct tcl/tk libs on ppcle
+ 
+ * Tue Jun 03 2014 Matej Stuchlik <mstuchli at redhat.com> - 3.4.1-9
+ - Change paths to bundled projects in rewheel patch
+ 
  * Fri May 30 2014 Miro Hrončok <mhroncok at redhat.com> - 3.4.1-8
  - In config script, use uname -m to write the arch