From 893bcefe27ac4c2507c19fbf5c0f760813af10e3 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Fri, 11 Sep 2015 09:13:38 +0200
Subject: [PATCH] New upstream (BZ#1259966)

---
 .gitignore               |  1 +
 docs-build-fix.patch     | 53 +++++++++++++++++++++++++---------------
 python-oauth2client.spec | 11 ++++++---
 sources                  |  2 +-
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f0928b..204c111 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /oauth2client-1.4.11.tar.gz
 /oauth2client-1.4.12.tar.gz
+/oauth2client-1.5.0.tar.gz
diff --git a/docs-build-fix.patch b/docs-build-fix.patch
index b0b6e2d..f75c8d0 100644
--- a/docs-build-fix.patch
+++ b/docs-build-fix.patch
@@ -1,7 +1,15 @@
-diff -up oauth2client-1.4.11/docs/conf.py.orig oauth2client-1.4.11/docs/conf.py
---- oauth2client-1.4.11/docs/conf.py.orig	2015-06-04 11:46:53.746947248 +0200
-+++ oauth2client-1.4.11/docs/conf.py	2015-06-04 11:47:08.138033410 +0200
-@@ -12,7 +12,7 @@ import os
+diff -up oauth2client-1.5.0/docs/conf.py.doc oauth2client-1.5.0/docs/conf.py
+--- oauth2client-1.5.0/docs/conf.py.doc	2015-09-03 18:50:23.000000000 +0200
++++ oauth2client-1.5.0/docs/conf.py	2015-09-11 09:11:16.365536545 +0200
+@@ -5,7 +5,6 @@
+ #
+ 
+ import os
+-from pkg_resources import get_distribution
+ import sys
+ 
+ # If extensions (or modules to document with autodoc) are in another directory,
+@@ -18,7 +17,7 @@ sys.path.insert(0, os.path.abspath('..')
  extensions = [
      'sphinx.ext.autodoc',
      'sphinx.ext.coverage',
@@ -10,21 +18,26 @@ diff -up oauth2client-1.4.11/docs/conf.py.orig oauth2client-1.4.11/docs/conf.py
      'sphinx.ext.viewcode',
  ]
  templates_path = ['_templates']
-diff -up oauth2client-1.4.11/docs/source/oauth2client.rst.orig oauth2client-1.4.11/docs/source/oauth2client.rst
---- oauth2client-1.4.11/docs/source/oauth2client.rst.orig	2015-06-04 11:46:40.402867355 +0200
-+++ oauth2client-1.4.11/docs/source/oauth2client.rst	2015-06-04 11:46:47.233908254 +0200
-@@ -4,14 +4,6 @@ oauth2client package
- Submodules
- ----------
+@@ -30,9 +29,8 @@ project = u'oauth2client'
+ copyright = u'2014, Google, Inc'
  
--oauth2client.appengine module
-------------------------------
--
--.. automodule:: oauth2client.appengine
--    :members:
--    :undoc-members:
--    :show-inheritance:
--
- oauth2client.client module
- --------------------------
+ # Version info
+-distro = get_distribution('oauth2client')
+-version = distro.version
+-release = distro.version
++version = '1.5.0'
++release = '1.5.0'
  
+ exclude_patterns = ['_build']
+ 
+diff -up oauth2client-1.5.0/docs/source/oauth2client.rst.doc oauth2client-1.5.0/docs/source/oauth2client.rst
+--- oauth2client-1.5.0/docs/source/oauth2client.rst.doc	2015-09-03 18:50:23.000000000 +0200
++++ oauth2client-1.5.0/docs/source/oauth2client.rst	2015-09-11 09:05:51.058373112 +0200
+@@ -6,7 +6,6 @@ Submodules
+ 
+ .. toctree::
+ 
+-   oauth2client.appengine
+    oauth2client.client
+    oauth2client.clientsecrets
+    oauth2client.crypt
diff --git a/python-oauth2client.spec b/python-oauth2client.spec
index bdf5891..2a0fbe5 100644
--- a/python-oauth2client.spec
+++ b/python-oauth2client.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           python-%{realname}
-Version:        1.4.12
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Python client library for OAuth 2.0
 
@@ -27,6 +27,7 @@ BuildRequires:  python-setuptools
 # Needed for docs build
 BuildRequires:  pyOpenSSL
 BuildRequires:  python-django
+BuildRequires:  python-flask
 BuildRequires:  python-gflags
 BuildRequires:  python-httplib2
 BuildRequires:  python-keyring
@@ -80,12 +81,12 @@ for the package. Documentation is shipped in html format.
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 
+%patch1 -p1 
 
 # We do not have the package for google.appengine support
 # This is removed because it breaks the docs build otherwise
-rm oauth2client/appengine.py
+rm -f docs/source/oauth2client.appengine.rst oauth2client/appengine.py
 
 %if %{with python3}
 rm -rf %{py3dir}
@@ -139,6 +140,8 @@ popd
 %endif
 
 %changelog
+* Fri Sep 04 2015 Michele Baldessari <michele@acksyn.org> - 1.5.0-1
+- New upstream (BZ#1259966)
 * Sun Jul 12 2015 Michele Baldessari <michele@acksyn.org> - 1.4.12-1
 - New upstream (BZ#1241304)
 * Mon Jun 22 2015 Michele Baldessari <michele@acksyn.org> - 1.4.11-2
diff --git a/sources b/sources
index 7455e03..57892a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4860eb70478b18626bcf75dcee100d40  oauth2client-1.4.12.tar.gz
+e829d6fb6d9d7ce6c1c9eb129552875d  oauth2client-1.5.0.tar.gz