[python-heatclient/f22] Fix EL6 build
Haïkel Guémar
hguemar at fedoraproject.org
Thu Mar 5 21:32:58 UTC 2015
commit 6871c5b05b36236201498f6a51e94657e8d457c2
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date: Thu Mar 5 22:31:25 2015 +0100
Fix EL6 build
python-heatclient.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/python-heatclient.spec b/python-heatclient.spec
index 8c945d5..9a6cba2 100644
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@ -38,7 +38,11 @@ the OpenStack Heat API.
Summary: Documentation for OpenStack Heat API Client
Group: Documentation
+%if 0%{?rhel} && 0%{?rhel} <= 6
+BuildRequires: python-sphinx10
+%else
BuildRequires: python-sphinx
+%endif
BuildRequires: python-oslo-sphinx
BuildRequires: git
@@ -81,7 +85,11 @@ install -m 644 -T tools/heat.bash_completion %{buildroot}%{_sysconfdir}/bash_com
rm -fr %{buildroot}%{python_sitelib}/heatclient/tests
export PYTHONPATH="$( pwd ):$PYTHONPATH"
+%if 0%{?rhel} && 0%{?rhel} <= 6
+sphinx-1.0-build -b html doc/source html
+%else
sphinx-build -b html doc/source html
+%endif
# Fix hidden-file-or-dir warnings
rm -fr html/.doctrees html/.buildinfo
@@ -101,7 +109,7 @@ rm -fr html/.doctrees html/.buildinfo
- Bump to 0.2.12 client release
* Mon Sep 22 2014 Ryan Brown <rybrown at redhat.com> - 0.2.11-2
-- Remove patch and use sed in %prep to fix oslosphinx import instead
+- Remove patch and use sed in prep to fix oslosphinx import instead
* Mon Sep 22 2014 Ryan Brown <rybrown at redhat.com> - 0.2.11-1
- Bump to new (0.2.11) client release
More information about the scm-commits
mailing list