diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-04 13:15:17 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-04 13:15:17 -0400 |
| commit | e5b939ee32ae7b7b3fbe8f18246e078766647949 (patch) | |
| tree | a765c13023228888828683d6b0ae5ad4cc2603f2 /redhat | |
| parent | 552563b480241e1d55ab964bf949b7369e33a872 (diff) | |
| download | bcfg2-e5b939ee32ae7b7b3fbe8f18246e078766647949.tar.gz bcfg2-e5b939ee32ae7b7b3fbe8f18246e078766647949.tar.bz2 bcfg2-e5b939ee32ae7b7b3fbe8f18246e078766647949.zip | |
require python-sphinx >= 1.0 across the board (for the other specfile now, too)
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/bcfg2.spec.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index 4a5f05bc6..2211dc99e 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -26,15 +26,15 @@ BuildRequires: python-setuptools-devel BuildRequires: python-setuptools %endif -# %{rhel} wasn't set before rhel 6. so this checks for old RHEL -# %systems (and potentially very old Fedora systems, too) -%if "%{_vendor}" == "redhat" && 0%{?rhel} < 6 +# 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 /usr/lib/python%{py_ver}/site-packages/Sphinx-1.0.4-py%{py_ver}.egg +%define pythonpath %(find %{python_sitelib} -name Sphinx*.egg) %else -BuildRequires: python-sphinx >= 0.6 +BuildRequires: python-sphinx >= 1.0 %endif BuildRequires: python-lxml |