[python-pip/epel7: 15/16] Merge branch 'master' into epel7

[Bohuslav Kabrda]

commit a78dc50b11adac3ff9722a1665735f1a7dfbd1d5
Merge: d42df6d 9297164
Author: Slavek Kabrda <bkabrda at redhat.com>
Date:   Thu Dec 18 09:21:24 2014 +0100

    Merge branch 'master' into epel7

 .gitignore                                         |    4 +
 ...p-bugs.python.org-issue17980-in-code-back.patch |   36 -
 local-dos.patch                                    |  395 +++++++
 ...-stripping-prefix-from-wheel-RECORD-files.patch |  102 ++
 python-pip.spec                                    |  137 ++-
 skip-network-tests.patch                           | 1079 ++++++++++++++++++++
 sources                                            |    3 +-
 7 files changed, 1677 insertions(+), 79 deletions(-)
---
diff --cc python-pip.spec
index e9d786c,7deafae..d9be143
--- a/python-pip.spec
+++ b/python-pip.spec
@@@ -1,5 -1,6 +1,6 @@@
 -%if (! 0%{?rhel}) || 0%{?rhel} > 6
 +%if (! 0%{?rhel}) || 0%{?rhel} > 7
  %global with_python3 1
+ %global build_wheel 1
  %endif
  %if 0%{?rhel} && 0%{?rhel} < 6
  %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}