diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-12-08 17:34:56 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-12-08 18:49:57 -0600 |
| commit | efa3a5ccda85548cd065dcf90a2aa690c2a6332e (patch) | |
| tree | fb6ecaae0098dfb8c356519cf7e882c52883b95c /misc | |
| parent | c8468bd55972c917774208bdfaed98a3e96fee6a (diff) | |
| download | bcfg2-efa3a5ccda85548cd065dcf90a2aa690c2a6332e.tar.gz bcfg2-efa3a5ccda85548cd065dcf90a2aa690c2a6332e.tar.bz2 bcfg2-efa3a5ccda85548cd065dcf90a2aa690c2a6332e.zip | |
added paranoid cache dir to spec file; fixed detection of old RHEL
(cherry picked from commit bab5c0865f582f7a3ddc72210816bbd77f14d035)
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2.spec | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index d19fc0b2d..54cb11ca8 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -30,7 +30,7 @@ BuildRequires: %{lxmldep} # %{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 +%if "%{_vendor}" == "redhat" && 0%{?rhel} <= 6 && 0%{?fedora} == 0 BuildRequires: python-sphinx10 # the python-sphinx10 package doesn't set sys.path correctly, so we # have to do it for them @@ -189,6 +189,8 @@ mv build/dtd %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}/ %{__install} -d %{buildroot}%{apache_conf}/conf.d %{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf +%{__mkdir_p} %{buildroot}%{_localstatedir}/cache/bcfg2 + %clean [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} || exit 2 @@ -204,6 +206,7 @@ mv build/dtd %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}/ %{_sysconfdir}/cron.hourly/bcfg2 %{_sysconfdir}/cron.daily/bcfg2 %{_prefix}/lib/bcfg2/bcfg2-cron +%{_localstatedir}/cache/bcfg2 %post -n bcfg2-server /sbin/chkconfig --add bcfg2-server |