diff --git a/docs-build-fix.patch b/docs-build-fix.patch index f75c8d0..07bd823 100644 --- a/docs-build-fix.patch +++ b/docs-build-fix.patch @@ -9,15 +9,6 @@ diff -up oauth2client-1.5.0/docs/conf.py.doc oauth2client-1.5.0/docs/conf.py 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', -- 'sphinx.ext.napoleon', -+ 'sphinxcontrib.napoleon', - 'sphinx.ext.viewcode', - ] - templates_path = ['_templates'] @@ -30,9 +29,8 @@ project = u'oauth2client' copyright = u'2014, Google, Inc' diff --git a/python-oauth2client.spec b/python-oauth2client.spec index 1584080..e4ee6ef 100644 --- a/python-oauth2client.spec +++ b/python-oauth2client.spec @@ -29,13 +29,13 @@ BuildRequires: pyOpenSSL BuildRequires: python-django BuildRequires: python-flask BuildRequires: python-gflags -BuildRequires: python-httplib2 +BuildRequires: python-httplib2 >= 0.9.1 BuildRequires: python-keyring -BuildRequires: python-pyasn1 -BuildRequires: python-pyasn1-modules -BuildRequires: python-rsa -BuildRequires: python-six -BuildRequires: python-sphinxcontrib-napoleon +BuildRequires: python-pyasn1 >= 0.1.7 +BuildRequires: python-pyasn1-modules >= 0.0.5 +BuildRequires: python-rsa >= 3.1.4 +BuildRequires: python-six >= 1.6.1 +BuildRequires: python-sphinx > 1.3 BuildRequires: python-sphinx_rtd_theme %if %{with python3} BuildRequires: python3-setuptools @@ -140,6 +140,9 @@ popd %endif %changelog +* Thu Nov 26 2015 Michele Baldessari - 1.5.2-2 +- Remove dependency on sphinx-contrib-napoleon now that sphinx is at version >= 1.3 +- Tighten versioned dependencies * Thu Nov 19 2015 Michele Baldessari - 1.5.2-1 - New upstream (BZ 1283443) * Tue Nov 10 2015 Fedora Release Engineering - 1.5.1-3