SPECS: cobbler.spec - add apache configs, missing dir

[glen]

Author: glen                         Date: Sun Dec  9 11:42:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add apache configs, missing dir

---- Files affected:
SPECS:
   cobbler.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/cobbler.spec
diff -u SPECS/cobbler.spec:1.2 SPECS/cobbler.spec:1.3
--- SPECS/cobbler.spec:1.2	Sun Dec  9 12:26:11 2007
+++ SPECS/cobbler.spec	Sun Dec  9 12:42:08 2007
@@ -1,13 +1,14 @@
 # $Revision$, $Date$
 # TODO
 # - webapps
-# - ImportError: No module named rhpl.translate
+# - FHS in web paths
 Summary:	Boot server configurator
 Name:		cobbler
 Version:	0.6.4
-Release:	0.3
+Release:	0.5
 Source0:	http://cobbler.et.redhat.com/download/%{name}-%{version}.tar.gz
 # Source0-md5:	1f46e1860e10b2e250c73ebb2a3d8227
+Source1:	%{name}-apache.conf
 License:	GPL v2+
 Group:		Applications/System
 Requires:	apache-mod_python
@@ -21,7 +22,7 @@
 %ifarch %{ix86} %{x8664}
 Requires:	syslinux
 %endif
-URL:		http://cobbler.et.redhat.com
+URL:		http://cobbler.et.redhat.com/
 BuildRequires:	python-cheetah
 BuildRequires:	python-devel
 #BuildRequires:	redhat-rpm-config
@@ -31,6 +32,8 @@
 ExcludeArch:	ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_webapps	/etc/webapps
+%define		_webapp		%{name}
 %define		_appdir		/var/www/cobbler
 %define		_cgibindir	/var/www/cgi-bin
 
@@ -60,6 +63,10 @@
 	--optimize=1 \
 	--root=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+
 %py_postclean
 
 mv $RPM_BUILD_ROOT/etc/{init.d,rc.d/init.d}/cobblerd
@@ -82,9 +89,26 @@
 	/sbin/chkconfig --del cobblerd
 fi
 
+%triggerin -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGELOG README
+
+%dir %attr(750,root,http) %{_webapps}/%{_webapp}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
+
 %defattr(755,http,http)
 %dir %{_cgibindir}/cobbler
 %{_cgibindir}/cobbler/findks.cgi
@@ -95,6 +119,7 @@
 %config(noreplace) %{_cgibindir}/cobbler/.htpasswd
 
 %defattr(755,http,http)
+%dir %{_datadir}/cobbler
 %dir %{_datadir}/cobbler/webui_templates
 %defattr(444,http,http)
 %{_datadir}/cobbler/webui_templates/*.tmpl
@@ -200,6 +225,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007-12-09 11:42:08  glen
+- add apache configs, missing dir
+
 Revision 1.2  2007-12-09 11:26:11  glen
 - pld packages and macros
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cobbler.spec?r1=1.2&r2=1.3&f=u