From 324a2ae8fcf2df5414d2a0730a3be7e48d093671 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 27 Dec 2016 17:11:31 +0100 Subject: [PATCH] Fix python 3.6 breakage --- docs-build-fix.patch | 23 +++++++++++++++++++---- python-oauth2client.spec | 7 +++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/docs-build-fix.patch b/docs-build-fix.patch index d503c9e..f8e8a9f 100644 --- a/docs-build-fix.patch +++ b/docs-build-fix.patch @@ -1,7 +1,22 @@ -diff -up oauth2client-3.0.0/docs/conf.py.orig oauth2client-3.0.0/docs/conf.py -diff -up oauth2client-3.0.0/docs/source/oauth2client.contrib.rst.orig oauth2client-3.0.0/docs/source/oauth2client.contrib.rst ---- oauth2client-3.0.0/docs/source/oauth2client.contrib.rst.orig 2016-11-10 15:17:16.959665736 +0100 -+++ oauth2client-3.0.0/docs/source/oauth2client.contrib.rst 2016-11-10 15:18:18.316713110 +0100 +diff -up oauth2client-3.0.0/docs/conf.py.doc oauth2client-3.0.0/docs/conf.py +--- oauth2client-3.0.0/docs/conf.py.doc 2016-12-27 17:01:44.043275431 +0100 ++++ oauth2client-3.0.0/docs/conf.py 2016-12-27 17:02:14.024315815 +0100 +@@ -64,9 +64,9 @@ project = u'oauth2client' + copyright = u'2014, Google, Inc' + + # Version info +-distro = get_distribution('oauth2client') +-version = distro.version +-release = distro.version ++#distro = get_distribution('oauth2client') ++version = '3.0.0' ++release = '3.0.0' + + exclude_patterns = ['_build'] + +diff -up oauth2client-3.0.0/docs/source/oauth2client.contrib.rst.doc oauth2client-3.0.0/docs/source/oauth2client.contrib.rst +--- oauth2client-3.0.0/docs/source/oauth2client.contrib.rst.doc 2016-07-28 20:50:44.000000000 +0200 ++++ oauth2client-3.0.0/docs/source/oauth2client.contrib.rst 2016-12-27 17:01:29.849256312 +0100 @@ -13,7 +13,6 @@ Submodules .. toctree:: diff --git a/python-oauth2client.spec b/python-oauth2client.spec index 4f4045f..efd58b1 100644 --- a/python-oauth2client.spec +++ b/python-oauth2client.spec @@ -12,7 +12,7 @@ Name: python-%{srcname} Version: 3.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} Group: Development/Languages @@ -39,6 +39,7 @@ BuildRequires: python2-pyasn1 >= 0.1.7 BuildRequires: python2-pyasn1-modules >= 0.0.5 BuildRequires: python-rsa >= 3.1.4 BuildRequires: python2-six >= 1.6.1 +BuildRequires: python-sqlalchemy BuildRequires: python-sphinx > 1.3 BuildRequires: python-sphinx_rtd_theme BuildRequires: python-tox @@ -130,7 +131,6 @@ rm -v docs/_build/html/{.buildinfo,objects.inv} %if %{with python3} pushd %{py3dir} %py3_build -popd %endif %install @@ -174,6 +174,9 @@ rm -r $(find %{_buildrootdir} -type d -name 'tests') %endif %changelog +* Tue Dec 27 2016 Michele Baldessari - 3.0.0-3 +- Fix python 3.6 breakage + * Mon Dec 19 2016 Miro HronĨok - 3.0.0-2 - Rebuild for Python 3.6