diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-21 14:47:40 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-21 14:47:40 -0400 |
commit | 520d236700d1a4cb6f02811edfc5e06560ad1bc7 (patch) | |
tree | 15d899677ba301c20d8589d11d895c950a38e67d /misc | |
parent | 24f6403f1ba483b813e30ea15446a59090d90d90 (diff) | |
download | bcfg2-520d236700d1a4cb6f02811edfc5e06560ad1bc7.tar.gz bcfg2-520d236700d1a4cb6f02811edfc5e06560ad1bc7.tar.bz2 bcfg2-520d236700d1a4cb6f02811edfc5e06560ad1bc7.zip |
Misc. build fixes:
* fixed detection of RHEL version and python Sphinx path
* added XSL file to do XSLT transform for build_dtddoc
Diffstat (limited to 'misc')
-rw-r--r-- | misc/bcfg2.spec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 27840fb5e..727b7bc72 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -28,11 +28,13 @@ BuildArch: noarch BuildRequires: python-devel BuildRequires: %{lxmldep} -%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 @@ -227,9 +229,11 @@ mv build/dtd %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}/ %{_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 %{_prefix}/lib/bcfg2 |