New upstream
This commit is contained in:
parent
54b6966083
commit
96150a088a
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 <michele@acksyn.org> - 3.0.0-1
|
||||
- New upstream
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-2
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user