[python-pbr/el6] finally fix build under rhel6
Matthias Runge
mrunge at fedoraproject.org
Fri May 31 12:06:02 UTC 2013
commit 4aa6093800a0fb2c1209b2c07108a4d0999f4851
Author: Matthias Runge <mrunge at redhat.com>
Date: Fri May 31 14:05:41 2013 +0200
finally fix build under rhel6
python-pbr.spec | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/python-pbr.spec b/python-pbr.spec
index 10c367b..e99ac16 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -20,15 +20,22 @@ BuildRequires: python-sphinx
# BuildRequires: python-setuptools_git
BuildRequires: python-testtools
#BuildRequires: python-testscenarios
-#BuildRequires: python-testresources
# not in the repos, yet
-#BuildRequires: python-discover
+# BuildRequires: python-discover
# BuildRequires: python-coverage >= 3.6
-#BuildRequires: python-flake8
+# BuildRequires: python-flake8
# BuildRequires: python-mox
# not in the repos, yet
-#BuildRequires: python-testrepository
+# BuildRequires: python-testrepository
# BuildRequires: python-subunit
+# BuildRequires: python-testresources
+
+%if 0%{?rhel}==6
+BuildRequires: python-sphinx10
+%else
+BuildRequires: python-sphinx >= 1.1.3
+%endif
+
%description
PBR is a library that injects some useful and sensible default behaviors into
@@ -50,7 +57,11 @@ rm -rf %{pypi_name}.egg-info
%{__python} setup.py build
# generate html docs
+%if 0%{?rhel}==6
+sphinx-1.0-build doc/source html
+%else
sphinx-build doc/source html
+%endif
# remove the sphinx-build leftovers
rm -rf html/.{doctrees,buildinfo}
@@ -70,6 +81,7 @@ rm -rf html/.{doctrees,buildinfo}
%changelog
* Fri May 31 2013 Matthias Runge <mrunge at redhat.com> - 0.5.11-2
- remove requirement setuptools_git
+- fix docs build under rhel
* Fri May 17 2013 Matthias Runge <mrunge at redhat.com> - 0.5.11-1
- update to 0.5.11 (rhbz#962132)
More information about the scm-commits
mailing list