[python-keystoneclient/el6] Fix FTBFS due to Sphinx version

Alan Pevec apevec at fedoraproject.org
Fri Apr 27 13:38:25 UTC 2012


commit cd6fef97ad87c6eb3e53759fb944b4727f985075
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Apr 27 15:27:41 2012 +0200

    Fix FTBFS due to Sphinx version
    
    From 2012-01-21 to 2012-04-20 there was an accidental EPEL update[1]
    which enabled previous build to succeed.
    
    [1] https://admin.fedoraproject.org/updates/FEDORA-EPEL-2011-5268/python-sphinx-1.0.8-1.el6

 python-keystoneclient.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
index 9671881..861a7b2 100644
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@ -10,7 +10,7 @@
 
 Name:       python-keystoneclient
 Version:    2012.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 #Release:    0.1.%{release_letter}%{milestone}%{?dist}
 Summary:    Python API and CLI for OpenStack Keystone
 
@@ -45,7 +45,7 @@ Group:      Documentation
 
 Requires:   %{name} = %{version}-%{release}
 
-BuildRequires: python-sphinx
+BuildRequires: python-sphinx10
 
 %description doc
 Documentation for the client library for interacting with Openstack
@@ -65,11 +65,14 @@ Keystone's API.
 rm -fr %{buildroot}%{python_sitelib}/tests
 
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
-sphinx-build -b html docs html
+sphinx-1.0-build -b html docs html
 
 # Fix hidden-file-or-dir warnings
 rm -fr html/.doctrees html/.buildinfo
 
+%clean
+rm -rf %{buildroot}
+
 %files
 %doc README.rst
 %{_bindir}/keystone
@@ -80,6 +83,9 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Fri Apr 27 2012 Alan Pevec <apevec at redhat.com> 2012.1-2
+- fix FTBFS due to wrong Sphinx version rhbz# 815055
+
 * Thu Apr 05 2012 Alan Pevec <apevec at redhat.com> 2012.1-1
 - Essex release
 


More information about the scm-commits mailing list