Merge pull request !3 from hy/work
This commit is contained in:
openeuler-ci-bot 2020-01-14 16:05:34 +08:00 committed by Gitee
commit 488fce5e87
2 changed files with 4 additions and 44 deletions

View File

@ -1,41 +0,0 @@
diff -Nur httplib2-0.13.0.orig/python2/httplib2/certs.py httplib2-0.13.0/python2/httplib2/certs.py
--- httplib2-0.13.0.orig/python2/httplib2/certs.py 2019-06-06 12:46:32.000000000 -0700
+++ httplib2-0.13.0/python2/httplib2/certs.py 2019-06-30 14:29:14.050085981 -0700
@@ -23,6 +23,7 @@
os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
)
+FEDORA_CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt"
def where():
env = os.environ.get("HTTPLIB2_CA_CERTS")
@@ -35,7 +36,7 @@
return custom_ca_locater_where()
if certifi_available:
return certifi_where()
- return BUILTIN_CA_CERTS
+ return FEDORA_CA_CERTS
if __name__ == "__main__":
diff -Nur httplib2-0.13.0.orig/python3/httplib2/certs.py httplib2-0.13.0/python3/httplib2/certs.py
--- httplib2-0.13.0.orig/python3/httplib2/certs.py 2019-06-06 12:46:32.000000000 -0700
+++ httplib2-0.13.0/python3/httplib2/certs.py 2019-06-30 14:29:38.778214191 -0700
@@ -23,6 +23,8 @@
os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
)
+FEDORA_CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt"
+
def where():
env = os.environ.get("HTTPLIB2_CA_CERTS")
@@ -35,7 +37,7 @@
return custom_ca_locater_where()
if certifi_available:
return certifi_where()
- return BUILTIN_CA_CERTS
+ return FEDORA_CA_CERTS
if __name__ == "__main__":

View File

@ -1,13 +1,11 @@
Name: python-httplib2 Name: python-httplib2
Version: 0.13.1 Version: 0.13.1
Release: 3 Release: 4
Summary: Small, fast HTTP client library for Python. Summary: Small, fast HTTP client library for Python.
License: MIT License: MIT
URL: https://github.com/httplib2/httplib2 URL: https://github.com/httplib2/httplib2
Source0: https://files.pythonhosted.org/packages/78/23/bb9606e87a66fd8c72a2b1a75b049d3859a122bc2648915be845bc44e04f/httplib2-0.13.1.tar.gz Source0: https://files.pythonhosted.org/packages/78/23/bb9606e87a66fd8c72a2b1a75b049d3859a122bc2648915be845bc44e04f/httplib2-0.13.1.tar.gz
Patch1: python-httplib2.certfile.patch
BuildRequires: python2-setuptools python2-devel BuildRequires: python2-setuptools python2-devel
%if 0%{?with_python3} %if 0%{?with_python3}
@ -73,6 +71,9 @@ popd
%endif %endif
%changelog %changelog
* Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.13.1-4
- Delete the useless patch
* Fri Jan 10 2020 gulining <gulining1@huawei.com> - 0.13.1-3 * Fri Jan 10 2020 gulining <gulining1@huawei.com> - 0.13.1-3
- Change the URL to a valid one - Change the URL to a valid one