[bcfg2/el6] python-sphinx10 is needed for rhel

Fabian Affolter fab at fedoraproject.org
Thu Mar 21 09:43:17 UTC 2013


commit 0955a1a1a8c37fec72c0fa821c9f6c1c74a6cc7a
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Mar 21 10:42:47 2013 +0100

    python-sphinx10 is needed for rhel

 bcfg2.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index d81b11d..48470d0 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -113,7 +113,16 @@ The Bcfg2 Web Reporting Interface.
 Summary:          Documentation for Bcfg2
 Group:            System
 
-BuildRequires:    python-sphinx
+# RHEL 5 and 6 ship with sphinx 0.6, but sphinx 1.0 is available with
+# a different package name in EPEL.
+%if "%{_vendor}" == "redhat" && 0%{?rhel} != 0
+BuildRequires:    python-sphinx10
+# the python-sphinx10 package doesn't set sys.path correctly, so we
+# have to do it for them
+%define pythonpath %(find %{python_sitelib} -name Sphinx*.egg)
+%else
+BuildRequires:    python-sphinx >= 1.0
+%endif
 BuildRequires:    python-docutils
 BuildRequires:    python-lxml
 


More information about the scm-commits mailing list