From 520d236700d1a4cb6f02811edfc5e06560ad1bc7 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 21 Apr 2011 14:47:40 -0400
Subject: Misc. build fixes:

* fixed detection of RHEL version and python Sphinx path
* added XSL file to do XSLT transform for build_dtddoc
---
 redhat/bcfg2.spec.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'redhat/bcfg2.spec.in')

diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in
index dc25ce522..432dee5b8 100644
--- a/redhat/bcfg2.spec.in
+++ b/redhat/bcfg2.spec.in
@@ -26,11 +26,13 @@ BuildRequires: python-setuptools-devel
 BuildRequires: python-setuptools
 %endif
 
-%if 0%{?rhel} <= 5
+# %{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
 BuildRequires: python-sphinx10
 # the python-sphinx10 package doesn't set sys.path correctly, so we
 # have to do it for them
-%define pythonpath %(rpm -ql python-sphinx10 | grep '\.egg$')
+%define pythonpath /usr/lib/python%{py_ver}/site-packages/Sphinx-1.0.4-py%{py_ver}.egg
 %else
 BuildRequires: python-sphinx >= 0.6
 %endif
@@ -235,9 +237,11 @@ fi
 %{_sbindir}/bcfg2-info
 %{_sbindir}/bcfg2-ping-sweep
 %{_sbindir}/bcfg2-lint
+%{_sbindir}/bcfg2-repo-validate
 %{_sbindir}/bcfg2-reports
 %{_sbindir}/bcfg2-server
 
+%{_mandir}/man5/bcfg2-lint.conf.5*
 %{_mandir}/man8/*.8*
 
 %dir %{_var}/lib/bcfg2
-- 
cgit v1.2.3-1-g7c22