Bacports, update, adapted for rosa2016.1

.abf.yml

@@ -1,2 +1,3 @@
 sources:
-  urllib3-1.25.6.tar.gz: 8f289db6fa9c80a165e93c7be44bb8b44b35018b
+  python-urllib3-1.26.4.tar.gz: de7dd51e53e0f87fdc07c863b97647b640af14f2
+  urllib3-1.26.4.tar.gz: fd72cf88f0437ab0297e39651f6d0ddf04672013

python-urllib3.spec

@@ -2,22 +2,14 @@
 
 Summary:	Python 2 HTTP library
 Name:		python-%{module}
-Version:	1.25.6
+Version:	1.26.4
 Release:	1
 License:	MIT
 Group:		Development/Python
-Url:		http://urllib3.readthedocs.org/
+URL:		http://urllib3.readthedocs.org/
-Source0:	https://pypi.python.org/packages/source/u/%{module}/%{module}-%{version}.tar.gz
+#Source0:	https://files.pythonhosted.org/packages/cb/cf/871177f1fc795c6c10787bc0e1f27bb6cf7b81dbde399fd35860472cecbc/urllib3-1.26.4.tar.gz
+Source0:    https://github.com/urllib3/urllib3/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:	ssl_match_hostname_py3.py
-BuildRequires:	pkgconfig(python)
-BuildRequires:	python-setuptools
-BuildRequires:	python-six
-# For unittests
-BuildRequires:	python-mock
-BuildRequires:	python-nose
-BuildRequires:	python-tornado
-Requires:	python-six
-Requires:	rootcerts
 BuildArch:	noarch
 
 %description
@@ -36,7 +28,37 @@ designed to be independent and standalone, each solving a different scope of
 problems, and urllib3 follows in a similar vein.
 This package contains the python2 files.
 
-%files
+%package -n python2-%{module}
+#py2_migration_meta python2-%{module}
+Summary:	Python 3 HTTP library
+Group:		Development/Python
+BuildRequires:	python-setuptools
+BuildRequires:	python-six
+BuildRequires:	pkgconfig(python)
+# For unittests
+BuildRequires:	python-mock
+BuildRequires:	python-nose
+BuildRequires:	python-tornado
+Requires:	python2-six
+Requires:	rootcerts
+
+%description -n python-%{module}
+The urllib3 module is a powerful, sanity-friendly HTTP client for Python. It
+offers some features that are missing from the Python standard libraries
+(urllib and urllib2):
+* Thread safety.
+* Connection pooling.
+* Client-side SSL/TLS verification.
+* File uploads with multipart encoding.
+* Helpers for retrying requests and dealing with HTTP redirects.
+* Support for gzip and deflate encoding.
+* Proxy support for HTTP and SOCKS.
+The Python standard libraries  have little to do with each other. They were
+designed to be independent and standalone, each solving a different scope of
+problems, and urllib3 follows in a similar vein.
+This package contains the python3 files.
+
+%files -n python-%{module}
 %doc CHANGES.rst README.rst CONTRIBUTORS.txt
 %{py_puresitedir}/*
 
@@ -87,17 +109,17 @@ cp -a . %{py3dir}
 
 %build
 # Build first the python2 stuff...
-python setup.py build
+%{__python2} setup.py build
 # ... next the python3 stuff
 pushd %{py3dir}
-	python3 setup.py build
+	%{__python3} setup.py build
 popd
 
 
 %install
 ################
 # Install first the python2 stuff...
-python setup.py install --skip-build --root %{buildroot}
+%{__python2} setup.py install --skip-build --root %{buildroot}
 
 rm -rf %{buildroot}/%{py_puresitedir}/urllib3/packages/six.py*
 rm -rf %{buildroot}/%{py_puresitedir}/urllib3/packages/ssl_match_hostname/
@@ -114,7 +136,7 @@ rm -rf %{buildroot}%{py_puresitedir}/dummyserver
 ###############
 # ... next the python3 stuff
 pushd %{py3dir}
-	python3 setup.py install --skip-build --root %{buildroot}
+	%{__python3} setup.py install --skip-build --root %{buildroot}
 
 	rm -rf %{buildroot}/%{py3_puresitedir}/urllib3/packages/six.py*
 	rm -rf %{buildroot}/%{py3_puresitedir}/urllib3/packages/ssl_match_hostname/
@@ -159,4 +181,3 @@ if st and st.type == "directory" then
     os.rename(path, path .. ".rpmmoved")
   end
 end
-