diff --git a/httplib2-0.7.7.tar.gz b/httplib2-0.7.7.tar.gz deleted file mode 100644 index 0a477e6..0000000 --- a/httplib2-0.7.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e2ce18092c32d1ec54f8a447e14e33585e30f240b883bfeeca65f12b3bcfaf6 -size 144020 diff --git a/httplib2-0.8.tar.gz b/httplib2-0.8.tar.gz new file mode 100644 index 0000000..1ec087c --- /dev/null +++ b/httplib2-0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cee59fdaa97a40ac505bb0629bdc8ba9ba79012d099ef11d6d3a284b7e369c9c +size 110854 diff --git a/httplib2-use-system-certs.patch b/httplib2-use-system-certs.patch index 7117c4b..4571c98 100644 --- a/httplib2-use-system-certs.patch +++ b/httplib2-use-system-certs.patch @@ -1,41 +1,42 @@ -Only in a/python2/httplib2: cacerts.txt -diff -ru a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py ---- a/python2/httplib2/__init__.py 2012-03-02 21:12:34.000000000 +0100 -+++ b/python2/httplib2/__init__.py 2012-06-20 13:30:39.524140796 +0200 -@@ -180,9 +180,8 @@ +diff -ruN a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py +--- a/python2/httplib2/__init__.py 2013-03-06 21:45:31.000000000 +0100 ++++ b/python2/httplib2/__init__.py 2013-03-22 14:02:09.458410128 +0100 +@@ -184,15 +184,8 @@ # requesting that URI again. DEFAULT_MAX_REDIRECTS = 5 --# Default CA certificates file bundled with httplib2. --CA_CERTS = os.path.join( +-try: +- # Users can optionally provide a module that tells us where the CA_CERTS +- # are located. +- import ca_certs_locater +- 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") -+# Use system-wide CA certificates: ++# Default CA certificates file bundled with httplib2. +CA_CERTS = '/etc/ssl/ca-bundle.pem' # Which headers are hop-by-hop headers by default HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] -Only in b/python2/httplib2: .__init__.py.swp -Only in a/python3/httplib2: cacerts.txt -diff -ru a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py ---- a/python3/httplib2/__init__.py 2012-03-02 21:12:34.000000000 +0100 -+++ b/python3/httplib2/__init__.py 2012-06-20 13:30:22.156140376 +0200 -@@ -119,9 +119,8 @@ - # Which headers are hop-by-hop headers by default +diff -ruN a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py +--- a/python3/httplib2/__init__.py 2013-03-06 21:45:31.000000000 +0100 ++++ b/python3/httplib2/__init__.py 2013-03-22 14:01:51.270409717 +0100 +@@ -124,8 +124,8 @@ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] --# Default CA certificates file bundled with httplib2. + # Default CA certificates file bundled with httplib2. -CA_CERTS = os.path.join( - os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") -+# Use system-wide CA certificates: +CA_CERTS = '/etc/ssl/ca-bundle.pem' ++ def _get_end2end_headers(response): hopbyhop = list(HOP_BY_HOP) -Only in b/python3/httplib2: .__init__.py.swp -diff -ru a/setup.py b/setup.py ---- a/setup.py 2012-03-02 21:12:34.000000000 +0100 -+++ b/setup.py 2012-06-20 13:28:26.560137617 +0200 -@@ -63,7 +63,6 @@ +diff -ruN a/setup.py b/setup.py +--- a/setup.py 2013-03-06 21:45:31.000000000 +0100 ++++ b/setup.py 2013-03-22 14:02:33.031410660 +0100 +@@ -62,7 +62,6 @@ """, package_dir=pkgdir, packages=['httplib2'], diff --git a/python-httplib2.changes b/python-httplib2.changes index 069d8ea..9a59123 100644 --- a/python-httplib2.changes +++ b/python-httplib2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 22 13:30:17 UTC 2013 - speilicke@suse.com + +- Update to version 0.8: + + Improved App Engine behavior + ------------------------------------------------------------------- Fri Jan 11 19:51:38 UTC 2013 - p.drouand@gmail.com diff --git a/python-httplib2.spec b/python-httplib2.spec index edf256e..7c1e544 100644 --- a/python-httplib2.spec +++ b/python-httplib2.spec @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define mod_name httplib2 Name: python-httplib2 -Version: 0.7.7 +Version: 0.8 Release: 0 Url: http://code.google.com/p/httplib2/ Summary: A Python HTTP client library License: MIT and Apache-2.0 and (MPL-1.1 or GPL-2.0+ or LGPL-2.1+) Group: Development/Libraries/Python -Source0: %{mod_name}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/h/httplib2/httplib2-%{version}.tar.gz # PATCH-FIX-OPENSUSE: Don't ship private copy of Mozilla NSS certs, use system certs instead (bnc#761162) Patch0: httplib2-use-system-certs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +# Test requirements (for ssl module): +#BuildRequires: python %if 0%{?sles_version} Requires: openssl-certs %else @@ -45,7 +46,7 @@ A comprehensive HTTP client library that supports many features left out of other HTTP libraries. %prep -%setup -q -n %{mod_name}-%{version} +%setup -q -n httplib2-%{version} %patch0 -p1 %build diff --git a/python3-httplib2.spec b/python3-httplib2.spec index d295f7b..bb88988 100644 --- a/python3-httplib2.spec +++ b/python3-httplib2.spec @@ -1,5 +1,5 @@ # -# spec file for package python-httplib2 +# spec file for package python3-httplib2 # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,37 +15,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define mod_name httplib2 Name: python3-httplib2 -Version: 0.7.7 +Version: 0.8 Release: 0 Url: http://code.google.com/p/httplib2/ Summary: A Python HTTP client library License: MIT and Apache-2.0 and (MPL-1.1 or GPL-2.0+ or LGPL-2.1+) Group: Development/Libraries/Python -Source0: %{mod_name}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/h/httplib2/httplib2-%{version}.tar.gz # PATCH-FIX-OPENSUSE: Don't ship private copy of Mozilla NSS certs, use system certs instead (bnc#761162) Patch0: httplib2-use-system-certs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3-devel +# Test requirements (for ssl module): +#BuildRequires: python3 %if 0%{?sles_version} Requires: openssl-certs %else Requires: ca-certificates %endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python3_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif %description A comprehensive HTTP client library that supports many features left out of other HTTP libraries. %prep -%setup -q -n %{mod_name}-%{version} +%setup -q -n httplib2-%{version} %patch0 -p1 %build @@ -55,7 +52,7 @@ python3 setup.py build python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} #%%check -#python python2/httplib2test.py +#python3 python3/httplib2test.py %files %defattr(-,root,root)