summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2010-10-21 09:30:34 -0500
committerSol Jerome <sol.jerome@gmail.com>2010-11-02 20:35:18 -0500
commit31688574736713d0f9bf33ed0c3a9ae8e5b0c718 (patch)
treecfbb069081f145241a51ab45d237b1c643301ab1
parentaa253e853dcc166d341d74cf4a1c27a4e563dc3a (diff)
downloadbcfg2-31688574736713d0f9bf33ed0c3a9ae8e5b0c718.tar.gz
bcfg2-31688574736713d0f9bf33ed0c3a9ae8e5b0c718.tar.bz2
bcfg2-31688574736713d0f9bf33ed0c3a9ae8e5b0c718.zip
spec: updated to handle opensuse and web reports
-rw-r--r--misc/bcfg2.spec19
1 files changed, 11 insertions, 8 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index c38e52c3b..e9798c39f 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -98,7 +98,14 @@ Version: %{version}
Summary: Bcfg2 Web Reporting Interface
Group: System Tools
Requires: bcfg2-server
-Requires: httpd,mod_wsgi,Django
+Requires: httpd,Django
+%if "%{_vendor}" == "redhat"
+Requires: mod_wsgi
+%define apache_conf %{_sysconfdir}/httpd
+%else
+Requires: apache2-mod_wsgi
+%define apache_conf %{_sysconfdir}/apache2
+%endif
%description -n bcfg2-web
Bcfg2 helps system administrators produce a consistent, reproducible,
@@ -150,10 +157,8 @@ deployment strategies.
%{__install} -m 755 debian/bcfg2.cron.hourly %{buildroot}%{_sysconfdir}/cron.hourly/bcfg2
%{__install} -m 755 tools/bcfg2-cron %{buildroot}%{_prefix}/lib/bcfg2/bcfg2-cron
-%if "%{_vendor}" == "redhat"
-%{__install} -d %{buildroot}%{_sysconfdir}/httpd/conf.d
-%{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/bcfg2.conf
-%endif
+%{__install} -d %{buildroot}%{apache_conf}/conf.d
+%{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/bcfg2.conf
%clean
[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} || exit 2
@@ -206,9 +211,7 @@ deployment strategies.
%{_datadir}/bcfg2/site_media
-%if "%{_vendor}" == "redhat"
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/bcfg2.conf
-%endif
+%config(noreplace) %{apache_conf}/conf.d/bcfg2.conf
%changelog
* Mon Jun 21 2010 Fabian Affolter <fabian@bernewireless.net> - 1.1.0rc3-0.1