Update to 0.9

This commit is contained in:
Kevin Fenzi 2014-05-25 14:25:44 -06:00
parent 97d7951034
commit 27c1b09794
4 changed files with 20 additions and 20 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ httplib2-0.4.0.tar.gz
/httplib2-0.7.6.tar.gz
/httplib2-0.7.7.tar.gz
/httplib2-0.9.tar.gz

View File

@ -1,16 +1,16 @@
diff -up ./python2/httplib2/__init__.py.orig ./python2/httplib2/__init__.py
--- ./python2/httplib2/__init__.py.orig 2012-02-24 14:07:01.232200397 +1000
+++ ./python2/httplib2/__init__.py 2012-02-24 14:13:51.290447860 +1000
@@ -177,8 +177,10 @@ class CertificateHostnameMismatch(SSLHan
DEFAULT_MAX_REDIRECTS = 5
# Default CA certificates file bundled with httplib2.
-CA_CERTS = os.path.join(
diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/httplib2/__init__.py
--- httplib2-0.9.orig/python2/httplib2/__init__.py 2014-04-14 06:52:57.000000000 -0600
+++ httplib2-0.9/python2/httplib2/__init__.py 2014-05-23 21:17:02.082118837 -0600
@@ -191,8 +191,10 @@
CA_CERTS = ca_certs_locater.get()
except ImportError:
# Default CA certificates file bundled with httplib2.
- CA_CERTS = os.path.join(
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+#CA_CERTS = os.path.join(
+# CA_CERTS = os.path.join(
+# os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# We use fedora ca bundle file instead, to preserve backward compability.
+CA_CERTS = "/etc/ssl/certs/ca-bundle.crt"
+ CA_CERTS = "/etc/ssl/certs/ca-bundle.crt"
# Which headers are hop-by-hop headers by default
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']

View File

@ -9,14 +9,13 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: python-httplib2
Version: 0.7.7
Release: 4%{?dist}
Version: 0.9
Release: 1%{?dist}
Summary: A comprehensive HTTP client library
Group: System Environment/Libraries
License: MIT
URL: http://code.google.com/p/httplib2/
Source0: http://httplib2.googlecode.com/files/httplib2-%{version}.tar.gz
#Patch0: httplib_py26.diff
URL: https://pypi.python.org/pypi/httplib2
Source0: https://pypi.python.org/packages/source/h/httplib2/httplib2-%{version}.tar.gz
Patch1: %{name}.certfile.patch
Patch2: %{name}.getCertHost.patch
Patch3: %{name}.rfc2459.patch
@ -45,8 +44,7 @@ other HTTP libraries.
%prep
%setup -q -n httplib2-%{version}
#%patch0 -p0 -b .issue39
%patch1 -p0 -b .certfile
%patch1 -p1 -b .certfile
%patch2 -p0 -b .getCertHost
%patch3 -p0 -b .rfc2459
@ -80,17 +78,18 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README
%{python_sitelib}/*
%if 0%{?with_python3}
%files -n python3-httplib2
%defattr(-,root,root,-)
%doc README
%{python3_sitelib}/*
%endif # with_python3
%changelog
* Fri May 23 2014 Kevin Fenzi <kevin@scrye.com> 0.9-1
- Update to 0.9
* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 0.7.7-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4

View File

@ -1 +1 @@
8ee8083423c2413a042116a1d5fdda31 httplib2-0.7.7.tar.gz
09d8e8016911fc40e2e4c58f1aa3ec24 httplib2-0.9.tar.gz