[python-httplib2/el6] Upstream update 0.7.2

Ding-Yi Chen dchen at fedoraproject.org
Fri Feb 24 14:27:44 UTC 2012


commit 7dad9369251cc0afdc270ebb410b9d4cc132ced7
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Sat Feb 25 00:27:30 2012 +1000

    Upstream update 0.7.2

 .gitignore                     |    1 +
 httplib_py26.diff              |  140 ----------------------------------------
 python-httplib2.certfile.patch |   16 +++++
 python-httplib2.spec           |   38 +++++++++--
 sources                        |    2 +-
 5 files changed, 50 insertions(+), 147 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 791f633..f5df1e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 httplib2-0.4.0.tar.gz
+/httplib2-0.7.2.tar.gz
diff --git a/python-httplib2.certfile.patch b/python-httplib2.certfile.patch
new file mode 100644
index 0000000..24039da
--- /dev/null
+++ b/python-httplib2.certfile.patch
@@ -0,0 +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(
+-        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
++#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"
+ 
+ # Which headers are hop-by-hop headers by default
+ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
diff --git a/python-httplib2.spec b/python-httplib2.spec
index a992cf2..6fad37d 100644
--- a/python-httplib2.spec
+++ b/python-httplib2.spec
@@ -1,14 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           python-httplib2
-Version:        0.4.0
-Release:        5%{?dist}
+Version:        0.7.2
+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-0.4.0.tar.gz
-Patch0:         httplib_py26.diff
+Source0:        http://httplib2.googlecode.com/files/httplib2-%{version}.tar.gz
+#Patch0:         httplib_py26.diff
+Patch1:         python-httplib2.certfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-setuptools-devel
@@ -21,7 +22,8 @@ other HTTP libraries.
 
 %prep
 %setup -q -n httplib2-%{version}
-%patch0 -p0 -b .issue39
+#%patch0 -p0 -b .issue39
+%patch1 -p0 -b .certfile
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -36,14 +38,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README PKG-INFO
+%doc README
 %{python_sitelib}/*
 
 %changelog
+* Fri Feb 24 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.2-1
+- Upstream update to 0.7.2
+  Which may fixed http://code.google.com/p/httplib2/issues/detail?id=62
+  Note this version uses fedora's cert file bundle instead of httplib2
+  default.
+
 * Fri Jul 29 2011 Ding-Yi Chen <dchen at redhat.com>  - 0.4.0-5
 - Apply that address python-httplib2 (GoogleCode Hosted) issue 39
   http://code.google.com/p/httplib2/issues/detail?id=39
 
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Aug 25 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.6.0-4
+- rebuild with python3.2
+  http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Tue Apr 20 2010 Tom "spot" Callaway <tcallawa at redhat.com>
+- minor spec cleanups
+- enable python3 support
+
+* Fri Apr 02 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.6.0-1
+- version upgrade (#566721)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index febab5d..4ce7f3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-022006c6c5fb75ea082b97d0fcc89d94  httplib2-0.4.0.tar.gz
+ea90d192a4ac8f727e1331ec41ea12d5  httplib2-0.7.2.tar.gz


More information about the scm-commits mailing list