[python-keystoneclient/el6-grizzly] use sphinx10 on el6

Alan Pevec apevec at fedoraproject.org
Mon Mar 4 17:00:00 UTC 2013


commit 97f4c183a71370d8caebaeca7a5cf700b35fd3f8
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Mar 4 17:56:53 2013 +0100

    use sphinx10 on el6

 python-keystoneclient.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
index 03d0ae8..643fce1 100644
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@ -34,7 +34,7 @@ Keystone's API.
 Summary:    Documentation for OpenStack Keystone API Client
 Group:      Documentation
 
-BuildRequires: python-sphinx
+BuildRequires: python-sphinx10
 
 %description doc
 Documentation for the client library for interacting with Openstack
@@ -60,7 +60,11 @@ rm -fr %{buildroot}%{python_sitelib}/tests
 
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 pushd doc
-make html
+if [ -x /usr/bin/sphinx-apidoc ]; then
+    make html
+else
+    make html SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build
+fi
 popd
 # Fix hidden-file-or-dir warnings
 rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo


More information about the scm-commits mailing list