summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-04 13:13:39 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-04 13:13:39 -0400
commit552563b480241e1d55ab964bf949b7369e33a872 (patch)
tree0fdf6ed1d83b8a75f328751000903307ee93e2d4 /misc
parentcab2a69fb2b3d7e2373015c0e89660c8a2a73dff (diff)
downloadbcfg2-552563b480241e1d55ab964bf949b7369e33a872.tar.gz
bcfg2-552563b480241e1d55ab964bf949b7369e33a872.tar.bz2
bcfg2-552563b480241e1d55ab964bf949b7369e33a872.zip
require python-sphinx >= 1.0 across the board
Diffstat (limited to 'misc')
-rw-r--r--misc/bcfg2.spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 73484d20f..5f360fbd3 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -41,15 +41,15 @@ BuildRequires: python-setuptools
BuildRequires: libsane1
%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 && 0%{?fedora} == 0
+# 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 >= 0.6
+BuildRequires: python-sphinx >= 1.0
%endif
%if 0%{?fedora} >= 16