Hello community,
here is the log from the commit of package python-httplib2 for openSUSE:Factory
checked in at 2012-06-25 12:44:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-httplib2 (Old)
and /work/SRC/openSUSE:Factory/.python-httplib2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-httplib2", Maintainer is "csten...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-httplib2/python-httplib2.changes
2012-06-06 16:09:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-httplib2.new/python-httplib2.changes
2012-06-25 12:44:52.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 20 11:41:56 UTC 2012 - sasc...@suse.de
+
+- Don't ship private copy of Mozilla NSS certs, use system certs
+ instead (bnc#761162)
+
+-------------------------------------------------------------------
New:
----
httplib2-use-system-certs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-httplib2.spec ++++++
--- /var/tmp/diff_new_pack.crOfE5/_old 2012-06-25 12:44:53.000000000 +0200
+++ /var/tmp/diff_new_pack.crOfE5/_new 2012-06-25 12:44:53.000000000 +0200
@@ -24,14 +24,16 @@
License: MIT
Group: Development/Libraries/Python
Source0: 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
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
+Requires: ca-certificates
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
BuildArch: noarch
%endif
-%endif
%description
A comprehensive HTTP client library that supports many features
@@ -39,15 +41,17 @@
%prep
%setup -q -n httplib2-%{version}
+%patch0 -p1
%build
python setup.py build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
--record-rpm=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%files -f INSTALLED_FILES
+%files
%defattr(-,root,root)
-%doc CHANGELOG README
+%doc README
+%{python_sitelib}/*
%changelog
++++++ httplib2-use-system-certs.patch ++++++
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 @@
# requesting that URI again.
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")
+# Use system-wide CA certificates:
+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
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate',
'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
-# 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 @@
""",
package_dir=pkgdir,
packages=['httplib2'],
- package_data={'httplib2': ['*.txt']},
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Web Environment',
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
