New upstream (NB: for now I am not shipping the tests, to be revised later)
This commit is contained in:
parent
8baaebd57c
commit
c59ce4b81a
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/oauth2client-1.5.0.tar.gz
|
||||
/oauth2client-1.5.1.tar.gz
|
||||
/oauth2client-1.5.2.tar.gz
|
||||
/oauth2client-2.0.1.tar.gz
|
||||
|
||||
@ -1,34 +1,38 @@
|
||||
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 @@
|
||||
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
|
||||
|
||||
# If extensions (or modules to document with autodoc) are in another directory,
|
||||
@@ -30,9 +29,8 @@ project = u'oauth2client'
|
||||
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
|
||||
+version = '1.5.0'
|
||||
+release = '1.5.0'
|
||||
+#distro = get_distribution('oauth2client')
|
||||
+#version = distro.version
|
||||
+#release = distro.version
|
||||
+version = '2.0.1'
|
||||
+release = '2.0.1'
|
||||
|
||||
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
|
||||
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
|
||||
@@ -13,7 +13,6 @@ Submodules
|
||||
|
||||
.. toctree::
|
||||
|
||||
- oauth2client.appengine
|
||||
oauth2client.client
|
||||
oauth2client.clientsecrets
|
||||
oauth2client.crypt
|
||||
- oauth2client.contrib.appengine
|
||||
oauth2client.contrib.devshell
|
||||
oauth2client.contrib.dictionary_storage
|
||||
oauth2client.contrib.django_orm
|
||||
|
||||
@ -11,16 +11,15 @@
|
||||
%endif
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 1.5.2
|
||||
Release: 2%{?dist}
|
||||
Version: 2.0.1
|
||||
Release: 1%{?dist}
|
||||
Summary: %{sum}
|
||||
|
||||
Group: Development/Languages
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/google/%{srcname}
|
||||
Source0: https://github.com/google/%{srcname}/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
|
||||
Patch0: remove-python-shebang-from-module.patch
|
||||
Patch1: docs-build-fix.patch
|
||||
Patch0: docs-build-fix.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: python2-devel
|
||||
@ -32,15 +31,21 @@ BuildRequires: python-flask
|
||||
BuildRequires: python2-gflags
|
||||
BuildRequires: python-httplib2 >= 0.9.1
|
||||
BuildRequires: python-keyring
|
||||
BuildRequires: python-pyasn1 >= 0.1.7
|
||||
BuildRequires: python-pyasn1-modules >= 0.0.5
|
||||
BuildRequires: python-mock
|
||||
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-sphinx > 1.3
|
||||
BuildRequires: python-sphinx_rtd_theme
|
||||
BuildRequires: python-tox
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-mock
|
||||
BuildRequires: python3-pyasn1 >= 0.1.7
|
||||
BuildRequires: python3-pyasn1-modules >= 0.0.5
|
||||
BuildRequires: python3-tox
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -54,8 +59,8 @@ Requires: pyOpenSSL
|
||||
Requires: python2-gflags
|
||||
Requires: python-httplib2 >= 0.9.1
|
||||
Requires: python-keyring
|
||||
Requires: python-pyasn1 >= 0.1.7
|
||||
Requires: python-pyasn1-modules >= 0.0.5
|
||||
Requires: python2-pyasn1 >= 0.1.7
|
||||
Requires: python2-pyasn1-modules >= 0.0.5
|
||||
Requires: python-rsa >= 3.1.4
|
||||
Requires: python2-six >= 1.6.1
|
||||
|
||||
@ -90,12 +95,11 @@ for the package. Documentation is shipped in html format.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{srcname}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch0 -p1 -b .doc
|
||||
|
||||
# We do not have the package for google.appengine support
|
||||
# This is removed because it breaks the docs build otherwise
|
||||
rm -f docs/source/oauth2client.appengine.rst oauth2client/appengine.py
|
||||
rm -f docs/source/oauth2client.contrib.appengine.rst oauth2client/appengine.py
|
||||
|
||||
%if %{with python3}
|
||||
rm -rf %{py3dir}
|
||||
@ -111,10 +115,9 @@ pushd docs
|
||||
make html
|
||||
popd
|
||||
unset PYTHONPATH
|
||||
rm -vrf docs/_build/html/_sources
|
||||
rm -vrf docs/_build/html/_static/fonts
|
||||
rm -fv docs/_build/html/{.buildinfo,objects.inv}
|
||||
|
||||
rm -vr docs/_build/html/_sources
|
||||
rm -vr docs/_build/html/_static/fonts
|
||||
rm -v docs/_build/html/{.buildinfo,objects.inv}
|
||||
|
||||
%if %{with python3}
|
||||
pushd %{py3dir}
|
||||
@ -131,6 +134,20 @@ pushd %{py3dir}
|
||||
popd
|
||||
%endif
|
||||
|
||||
%check
|
||||
tox --sitepackages -e py27
|
||||
|
||||
%if %{with python3}
|
||||
pushd %{py3dir}
|
||||
#python3-tox --sitepackages -e py35
|
||||
popd
|
||||
%endif
|
||||
|
||||
# We remove tests currently, we will ship them eventually
|
||||
# This is a bit of a hack until I package the test scripts in a separate package
|
||||
rm -r $(find %{_buildrootdir} -type d -name 'tests')
|
||||
|
||||
|
||||
%files -n python2-%{srcname}
|
||||
%license LICENSE
|
||||
%doc CHANGELOG.md CONTRIBUTING.md README.md
|
||||
@ -149,6 +166,9 @@ popd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Mar 08 2016 Michele Baldessari <michele@acksyn.org> - 2.0.1-1
|
||||
- New upstream (NB: for now I am not shipping the tests, to be revised later)
|
||||
|
||||
* Thu Nov 26 2015 Michele Baldessari <michele@acksyn.org> - 1.5.2-2
|
||||
- Remove dependency on sphinx-contrib-napoleon now that sphinx is at version >= 1.3
|
||||
- Tighten versioned dependencies
|
||||
|
||||
Loading…
Reference in New Issue
Block a user