Accepting request 373515 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/373515
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-requests?expand=0&rev=32

python-requests.spec

@@ -29,19 +29,26 @@ Url:            http://python-requests.org/
 Source:         http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz
 # PATCH-FIX-OPENSUSE no-default-cacert.patch -- Completely ignore the internal CA bundle.
 Patch0:         no-default-cacert.patch
+# PATCH-FIX-UPSTREAM update urllib3 to do the proper passthrough to set_default_verify_paths
+Patch1:         urllib3-ssl-default-context.patch
 BuildRequires:  python
 BuildRequires:  python-devel
 BuildRequires:  python-py
 BuildRequires:  python-setuptools
 Requires:       python
-# Really needed?
-#Requires:       python-ndg-httpsclient
-Requires:       python-pyOpenSSL
-Requires:       python-pyasn1
-%if 0%{?suse_version} >= 1120 && !(0%{?suse_version} == 1315 && !0%{?is_opensuse})
+# requirements for pyopenssl fallback of bundled urllib3
+Recommends:     python-ndg-httpsclient
+Recommends:     python-pyOpenSSL
+Recommends:     python-pyasn1
+%if 0%{?suse_version} <= 1200
+BuildRequires:  openssl-certs
+Requires:       openssl-certs
+%else
 BuildRequires:  ca-certificates
 Requires:       ca-certificates
 %endif
+# for good measure, at least recommend an actual set of certificates
+Recommends:     ca-certificates-mozilla
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %else
@@ -73,10 +80,11 @@ Features:
 
 %prep
 %setup -q -n requests-%{version}
-%if 0%{?suse_version} >= 1120 && !(0%{?suse_version} == 1315 && !0%{?is_opensuse})
 %patch0 -p1
+pushd requests/packages
+%patch1 -p1
+popd
 rm -f requests/cacert.pem
-%endif
 
 %build
 python setup.py build