SPECS: oreon.spec - webapp path

[wolvverine]

Author: wolvverine                   Date: Sun Jun 17 00:48:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- webapp path

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

---- Diffs:

================================================================
Index: SPECS/oreon.spec
diff -u SPECS/oreon.spec:1.2 SPECS/oreon.spec:1.3
--- SPECS/oreon.spec:1.2	Sun Jun 17 02:39:11 2007
+++ SPECS/oreon.spec	Sun Jun 17 02:48:45 2007
@@ -13,10 +13,9 @@
 %define		RRD_PERL		%{perl_vendorarch}
 %define		_webapps	/etc/webapps
 %define		_webapp         oreon
-%define		_sysconfdir     %{_webapps}/%{_webapp}
+%define		_webconfdir     %{_webapps}/%{_webapp}
 %define		_appdir         %{_datadir}/%{_webapp}
 
-
 Summary:	Oreon - provide enterprise monitoring based on Nagios core.
 Name:		oreon
 Version:	1.4
@@ -94,10 +93,9 @@
 
 %build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/nagios/plugins,%{_sysconfdir}{/rc.d/init.d,/nagios},%{_bindir},%{_datadir}/%{name},%{INSTALL_DIR_OREON}/{cron/reporting/api,ODS}}
+install -d $RPM_BUILD_ROOT{%{_libdir}/nagios/plugins,%{_sysconfdir}{/rc.d/init.d,/nagios},%{_bindir},%{_datadir}/%{name},%{INSTALL_DIR_OREON}/{cron/reporting/api,ODS},%{_webconfdir}}
 
 # install nagios  plugins
 for fichier in %{PLUGINS_DIR}/src/*
@@ -134,8 +132,8 @@
 
 install cron/delete*.pl $RPM_BUILD_ROOT%{INSTALL_DIR_OREON}/cron
 install cron/reporting/api/* $RPM_BUILD_ROOT%{INSTALL_DIR_OREON}/cron/reporting/api
-install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install apache.conf $RPM_BUILD_ROOT%{_webconfdir}/apache.conf
+install apache.conf $RPM_BUILD_ROOT%{_webconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -170,8 +168,8 @@
 %defattr(644,root,root,755)
 %doc CHANGELOG README cron/*README.txt cron/reporting/*README.txt
 %dir %attr(750,root,http) %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webconfdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webconfdir}/httpd.conf
 #%attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %attr(755,root,root) %{_libdir}/nagios/plugins/*
@@ -203,6 +201,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/06/17 00:48:45  wolvverine
+- webapp path
+
 Revision 1.2  2007/06/17 00:39:11  wolvverine
 - add subpackage setup
 
================================================================

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