[python/f20: 11/11] Merge branch 'f19' into f20

[Bohuslav Kabrda]

commit 4e26fc2842862776c2bd6309619dce1233037bb9
Merge: 6f65730 a9f6e89
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Aug 26 09:39:29 2013 +0200

    Merge branch 'f19' into f20
    
    Conflicts:
    	python.spec

 00185-urllib2-honors-noproxy-for-ftp.patch         |   12 +
 00186-memory-leak-marshalc.patch                   |   57 +++++
 00187-add-RPATH-to-pyexpat.patch                   |   25 ++
 ...-4238-hostname-check-bypass-in-SSL-module.patch |  247 ++++++++++++++++++++
 python.spec                                        |   29 ++-
 5 files changed, 367 insertions(+), 3 deletions(-)
---
diff --cc python.spec
index 3953bcf,75d4b9a..b803c62
--- a/python.spec
+++ b/python.spec
@@@ -106,7 -106,7 +106,7 @@@ Summary: An interpreted, interactive, o
  Name: %{python}
  # Remember to also rebase python-docs when changing this:
  Version: 2.7.5
--Release: 5%{?dist}
++Release: 6%{?dist}
  License: Python
  Group: Development/Languages
  Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@@ -2010,12 -2030,12 +2030,15 @@@ rm -fr %{buildroot
  # ======================================================
  
  %changelog
 -* Mon Aug 26 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 2.7.5-5
++* Mon Aug 26 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 2.7.5-6
+ - Sync back/renumber patches to stay consistent with rhel.
+ 
 -* Mon Aug 19 2013 Matej Stuchlik <mstuchli at redhat.com> - 2.7.5-4
 +* Mon Aug 19 2013 Matej Stuchlik <mstuchli at redhat.com> - 2.7.5-5
  - Added fix for CVE-2013-4238 (rhbz#998430)
  
 +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.5-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
  * Mon Jul 08 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 2.7.5-3
  - Fix build with libffi containing multilib wrapper for ffi.h (rhbz#979696).