From 96150a088a328d65bcb2a167dd1f52922f4dea6e Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Thu, 10 Nov 2016 15:27:25 +0100 Subject: [PATCH] New upstream --- .gitignore | 1 + docs-build-fix.patch | 36 +++++------------------------------- python-oauth2client.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 16 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 9ee3660..9cd9bc7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /oauth2client-1.5.2.tar.gz /oauth2client-2.0.1.tar.gz /oauth2client-2.1.0.tar.gz +/oauth2client-3.0.0.tar.gz diff --git a/docs-build-fix.patch b/docs-build-fix.patch index 8310ef2..d503c9e 100644 --- a/docs-build-fix.patch +++ b/docs-build-fix.patch @@ -1,33 +1,7 @@ -diff -up oauth2client-2.0.1/docs/conf.py.doc oauth2client-2.0.1/docs/conf.py ---- oauth2client-2.0.1/docs/conf.py.doc 2016-03-03 18:55:09.000000000 +0100 -+++ oauth2client-2.0.1/docs/conf.py 2016-03-08 08:07:21.000373724 +0100 -@@ -5,7 +5,7 @@ - # - - import os --from pkg_resources import get_distribution -+#from pkg_resources import get_distribution - import sys - - import mock -@@ -55,9 +55,11 @@ 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 = distro.version -+#release = distro.version -+version = '2.0.1' -+release = '2.0.1' - - exclude_patterns = ['_build'] - -diff -up oauth2client-2.0.1/docs/source/oauth2client.contrib.rst.doc oauth2client-2.0.1/docs/source/oauth2client.contrib.rst ---- oauth2client-2.0.1/docs/source/oauth2client.contrib.rst.doc 2016-03-08 08:17:46.470272128 +0100 -+++ oauth2client-2.0.1/docs/source/oauth2client.contrib.rst 2016-03-08 08:17:54.748284201 +0100 +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 @@ -13,7 +13,6 @@ Submodules .. toctree:: @@ -35,4 +9,4 @@ diff -up oauth2client-2.0.1/docs/source/oauth2client.contrib.rst.doc oauth2clien - oauth2client.contrib.appengine oauth2client.contrib.devshell oauth2client.contrib.dictionary_storage - oauth2client.contrib.django_orm + oauth2client.contrib.flask_util diff --git a/python-oauth2client.spec b/python-oauth2client.spec index 7c166ed..b040ce6 100644 --- a/python-oauth2client.spec +++ b/python-oauth2client.spec @@ -11,8 +11,8 @@ %endif Name: python-%{srcname} -Version: 2.1.0 -Release: 2%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: %{sum} Group: Development/Languages @@ -28,6 +28,7 @@ BuildRequires: python2-setuptools BuildRequires: pyOpenSSL BuildRequires: python-crypto BuildRequires: python-django +BuildRequires: python2-fasteners BuildRequires: python-flask BuildRequires: python2-gflags BuildRequires: python-httplib2 >= 0.9.1 @@ -46,6 +47,7 @@ BuildRequires: python-webtest %if %{with python3} BuildRequires: python3-setuptools BuildRequires: python3-devel +BuildRequires: python2-fasteners BuildRequires: python3-mock BuildRequires: python3-pyasn1 >= 0.1.7 BuildRequires: python3-pyasn1-modules >= 0.0.5 @@ -61,6 +63,7 @@ Summary: %{sum} Requires: pyOpenSSL Requires: python2-gflags +Requires: python2-fasteners Requires: python-httplib2 >= 0.9.1 Requires: python-keyring Requires: python2-pyasn1 >= 0.1.7 @@ -79,6 +82,7 @@ Summary: %{sum} Requires: python3-pyOpenSSL Requires: python3-gflags +Requires: python3-fasteners Requires: python3-httplib2 >= 0.9.1 Requires: python3-keyring Requires: python3-pyasn1 >= 0.1.7 @@ -170,6 +174,9 @@ rm -r $(find %{_buildrootdir} -type d -name 'tests') %endif %changelog +* Thu Nov 10 2016 Michele Baldessari - 3.0.0-1 +- New upstream + * Tue Jul 19 2016 Fedora Release Engineering - 2.1.0-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 5a21302..853235d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31cf17622b54b8c491274a5ca7dc038e oauth2client-2.1.0.tar.gz +99b608799eec755bd9c873813310177e oauth2client-3.0.0.tar.gz