SPECS: monitorix.spec - macros 1.268 for %service

[glen]

Author: glen                         Date: Sun May 21 15:18:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- macros 1.268 for %service

---- Files affected:
SPECS:
   monitorix.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/monitorix.spec
diff -u SPECS/monitorix.spec:1.7 SPECS/monitorix.spec:1.8
--- SPECS/monitorix.spec:1.7	Sun May 21 17:05:16 2006
+++ SPECS/monitorix.spec	Sun May 21 17:18:11 2006
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - post/preun for initscript
+# - webapps integration
 Summary:	Lightweight system monitoring tool designed to monitorize as many services as it can
 Name:		monitorix
 Version:	0.8.1
@@ -11,6 +11,7 @@
 Source0:	http://www.monitorix.org/%{name}-%{version}.tar.gz
 # Source0-md5:	ddd330c84b59ea7ebb7cf63d9031757f
 Source1:	%{name}.conf
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	bash
 Requires:	perl-rrdtool
 Requires:	rc-scripts
@@ -75,6 +76,13 @@
 
 %post
 /sbin/chkconfig --add monitorix
+%service %{name} restart
+
+%preun
+if [ "$1" = "0" ]; then
+	%service %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
 
 %triggerin -- apache1
 %webapp_register apache %{_webapp}
@@ -88,12 +96,6 @@
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%preun
-if [ "$1" = "0" ]; then
-	%service %{name} stop
-	/sbin/chkconfig --del %{name}
-fi
-
 %files
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/monitorix
@@ -127,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/05/21 15:18:11  glen
+- macros 1.268 for %service
+
 Revision 1.7  2006/05/21 15:05:16  paszczus
 - added preun
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/monitorix.spec?r1=1.7&r2=1.8&f=u