From 61f5e33eb3a1e0cc196f98e553e3283168b95a0e Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Fri, 6 Mar 2015 13:40:08 +0100 Subject: [PATCH] Fix EL6 build Fix nose patch --- python-urllib3-old-nose-compat.patch | 16 ++++++++-------- python-urllib3.spec | 8 ++++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/python-urllib3-old-nose-compat.patch b/python-urllib3-old-nose-compat.patch index 986f9d7..ad851e0 100644 --- a/python-urllib3-old-nose-compat.patch +++ b/python-urllib3-old-nose-compat.patch @@ -1,14 +1,14 @@ -From d1b64a6dc91bc9c350ac503febc34340c94c9066 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Wed, 25 Sep 2013 13:28:37 -0400 -Subject: [PATCH 3/3] old nose compat +From de33e923b6af308ca9f5aec5e5c3f625dc903f48 Mon Sep 17 00:00:00 2001 +From: Haikel Guemar +Date: Tue, 3 Mar 2015 15:28:22 +0100 +Subject: [PATCH] Old nose compat --- setup.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.cfg b/setup.cfg -index 8f1fee7..a8b1d1d 100644 +index b140696..eeb3f0b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,6 @@ @@ -19,8 +19,8 @@ index 8f1fee7..a8b1d1d 100644 -cover-min-percentage = 100 -cover-erase = true - [egg_info] - tag_build = + [flake8] + max-line-length = 99 -- -1.8.3.1 +2.1.0 diff --git a/python-urllib3.spec b/python-urllib3.spec index 6e237bf..0d22e63 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,7 +1,11 @@ +%if 0%{?rhel} && 0%{?rhel} <= 6 +%{!?__python2: %global __python2 /usr/bin/python2} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif + %if 0%{?fedora} %global with_python3 1 -%else -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif %global srcname urllib3