ralph pushed to python-urllib3 (f21). "Merge branch 'master' into f21"

[notifications at fedoraproject.org]

>From af5280cb42e1f515c7d593cb5f7164a69cd0919c Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Fri, 6 Mar 2015 13:40:08 +0100
Subject: Fix EL6 build

Fix nose patch

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 <rbean at redhat.com>
-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 <hguemar at fedoraproject.org>
+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 0a911ce..1b71e68 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
-- 
cgit v0.10.2


>From 9dff84a0d379c93b7846313a4ae81aca1ed612f7 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean at redhat.com>
Date: Wed, 22 Apr 2015 10:01:54 -0400
Subject: 1.10.3


diff --git a/.gitignore b/.gitignore
index 46ef635..0b3b605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /urllib3-1.10.tar.gz
 /urllib3-1.10.1.tar.gz
 /urllib3-1.10.2.tar.gz
+/urllib3-1.10.3.tar.gz
diff --git a/python-urllib3.spec b/python-urllib3.spec
index 1b71e68..c11a9e1 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -11,7 +11,7 @@
 %global srcname urllib3
 
 Name:           python-%{srcname}
-Version:        1.10.2
+Version:        1.10.3
 Release:        1%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
@@ -167,6 +167,9 @@ rm -rf %{buildroot}/%{python3_sitelib}/__pycache__*
 %endif # with_python3
 
 %changelog
+* Wed Apr 22 2015 Ralph Bean <rbean at redhat.com> - 1.10.3-1
+- new version
+
 * Thu Feb 26 2015 Ralph Bean <rbean at redhat.com> - 1.10.2-1
 - new version
 
diff --git a/sources b/sources
index 929b717..397d408 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5b04971d8e6a77b591284d407e810fb  urllib3-1.10.2.tar.gz
+82fd4811f6164fcac0f8e959843c4a63  urllib3-1.10.3.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-urllib3.git/commit/?h=f21&id=a6eaa65ebe18e547c7e7323a9bdfefdbf698c71c