diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-10 13:29:23 -0400 |
| commit | 90c85147bacea14771abf8faa1fc5f185418d14b (patch) | |
| tree | b10e06fc80ed714f5376b169e32b8953479211f1 /redhat | |
| parent | 4f3da4543ec4e8c3c4776ae2ee3611e47ce78525 (diff) | |
| parent | ce6a228d33ace4136dc2b5388c64795dfbd26ffb (diff) | |
| download | bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.gz bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.tar.bz2 bcfg2-90c85147bacea14771abf8faa1fc5f185418d14b.zip | |
Merge branch 'master' of github.com:solj/bcfg2
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/RELEASE | 2 | ||||
| -rw-r--r-- | redhat/bcfg2.spec.in | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/redhat/RELEASE b/redhat/RELEASE index 22a4ba1bd..a0694f914 100644 --- a/redhat/RELEASE +++ b/redhat/RELEASE @@ -1 +1 @@ -0.0pre1 +0.0pre2 diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index dd6e70f86..432dee5b8 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -15,8 +15,8 @@ Summary: Configuration management system Group: Applications/System License: BSD -URL: http://trac.mcs.anl.gov/projects/bcfg2 -Source0: %{name}-%{version}-%{release}.tar.gz +URL: http://bcfg2.org +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -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 @@ -234,16 +236,18 @@ fi %{_sbindir}/bcfg2-build-reports %{_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 %files doc -%defattr(0644,root,root,-) +%defattr(-,root,root,-) %doc %{_defaultdocdir}/bcfg2-doc-%{version} %changelog |