SPECS: ocs-ng-inventory.spec - webapps, NFY

[wolvverine]

Author: wolvverine                   Date: Tue Oct  3 14:40:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- webapps, NFY

---- Files affected:
SPECS:
   ocs-ng-inventory.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/ocs-ng-inventory.spec
diff -u SPECS/ocs-ng-inventory.spec:1.9 SPECS/ocs-ng-inventory.spec:1.10
--- SPECS/ocs-ng-inventory.spec:1.9	Tue Oct  3 15:45:45 2006
+++ SPECS/ocs-ng-inventory.spec	Tue Oct  3 16:40:50 2006
@@ -32,9 +32,15 @@
 Requires:	perl-XML-Simple >= 2.12
 Requires:	php-common >= 3:4.3.2
 Requires:	php-pecl-zip
+Requires:       webapps
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define         _webapps        /etc/webapps
+%define         _webapp         %{name}
+%define         _webappconfdir  %{_webapps}/%{_webapp}
+%define         _appdir         %{_datadir}/%{_webapp}
+
 %description
 Open Computer and Software Inventory Next Generation is an application
 designed to help a network or system administrator keep track of the
@@ -107,20 +113,36 @@
 cd ..
 
 install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/logrotate.d,%{_var}/log/%{name}}
+install -d $RPM_BUILD_ROOT{%{_appdir},%{_webappconfdir}}
 cp -Rf ocsreports/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-# TODO patch this file for PLD
 install Apache/logrotate.ocsinventory-NG $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ocs-inventory-ng
-#install ocsinventory.conf $APACHE_CONFIG_DIRECTORY/ocsinventory.conf
+install Apache/ocsinventory.conf $RPM_BUILD_ROOT%{_webappconfdir}/apache.conf
+install Apache/ocsinventory.conf $RPM_BUILD_ROOT%{_webappconfdir}/httpd.conf
 install ipdiscover-util/ipdiscover-util.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/ipdiscover-util.pl
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%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 README ocs-errors $SOURCE2 $SOURCE3
-/etc/logrotate.d/ocs-inventory-ng
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ocs-inventory-ng
+%attr(750,root,http) %dir %{_webappconfdir}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappconfdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappconfdir}/httpd.conf
 %attr(755,root,root) %{_bindir}/Ocsinventory_local.pl
 %{_datadir}/%{name}/
 %{perl_vendorlib}/
@@ -135,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/10/03 14:40:50  wolvverine
+- webapps, NFY
+
 Revision 1.9  2006/10/03 13:45:45  wolvverine
 - add log directory
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ocs-ng-inventory.spec?r1=1.9&r2=1.10&f=u