diff --git a/no-default-cacert-sles.patch b/no-default-cacert-sles.patch deleted file mode 100644 index a4ddceb..0000000 --- a/no-default-cacert-sles.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: requests-1.1.0/MANIFEST.in -=================================================================== ---- requests-1.1.0.orig/MANIFEST.in -+++ requests-1.1.0/MANIFEST.in -@@ -1 +1 @@ --include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem -+include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt -Index: requests-1.1.0/requests/adapters.py -=================================================================== ---- requests-1.1.0.orig/requests/adapters.py -+++ requests-1.1.0/requests/adapters.py -@@ -132,9 +132,6 @@ class HTTPAdapter(BaseAdapter): - if not cert_loc: - cert_loc = DEFAULT_CA_BUNDLE_PATH - -- if not cert_loc: -- raise Exception("Could not find a suitable SSL CA certificate bundle.") -- - conn.cert_reqs = 'CERT_REQUIRED' - conn.ca_certs = cert_loc - else: -Index: requests-1.1.0/requests/certs.py -=================================================================== ---- requests-1.1.0.orig/requests/certs.py -+++ requests-1.1.0/requests/certs.py -@@ -19,7 +19,7 @@ - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return None - - if __name__ == '__main__': - print(where()) diff --git a/python-requests.changes b/python-requests.changes index d17c1ad..3a3c8d8 100644 --- a/python-requests.changes +++ b/python-requests.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 14 19:24:43 UTC 2015 - sor.alexei@meowr.ru + +- Add python3-chardet to build requirements for tests. +- Remove no-default-cacert-sles.patch as no-default-cacert.patch + does basically the same. + ------------------------------------------------------------------- Fri Oct 9 19:11:09 UTC 2015 - sor.alexei@meowr.ru diff --git a/python-requests.spec b/python-requests.spec index 0cfbf20..3bf3208 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -26,10 +26,8 @@ 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-SLE no-default-cacert-sles.patch -- completely ignore the internal CA bundle (SLES version) -Patch1: no-default-cacert-sles.patch # PATCH-FIX-OPENSUSE requests-do-not-use-bundle.patch --use system libraries instead of bundled ones -Patch2: requests-do-not-use-bundle.patch +Patch1: requests-do-not-use-bundle.patch BuildRequires: python BuildRequires: python-devel BuildRequires: python-py @@ -72,12 +70,8 @@ Features: %setup -q -n requests-%{version} # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./requests/certs.py -%if 0%{?suse_version} == 1110 || (0%{?suse_version} == 1315 && !0%{?is_opensuse}) -%patch1 -p1 -%else %patch0 -p1 -%endif -%patch2 -p1 +%patch1 -p1 rm ./requests/cacert.pem %build