SPECS: nagios.spec - use %service in trigger to respect skip auto ...

[glen]

Author: glen                         Date: Wed Jan  4 14:10:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service in trigger to respect skip auto restarts of services
- sorted preambles
- rel 2

---- Files affected:
SPECS:
   nagios.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/nagios.spec
diff -u SPECS/nagios.spec:1.66 SPECS/nagios.spec:1.67
--- SPECS/nagios.spec:1.66	Wed Dec 21 22:36:15 2005
+++ SPECS/nagios.spec	Wed Jan  4 15:10:33 2006
@@ -8,7 +8,7 @@
 Name:		nagios
 Version:	2.0
 %define	_rc     b6
-%define	_rel	1
+%define	_rel	2
 Release:	0.%{_rc}.%{_rel}
 License:	GPL v2
 Group:		Networking
@@ -33,19 +33,19 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 %endif
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
-BuildRequires:	rpmbuild(macros) >= 1.264
 BuildRequires:	tar >= 1:1.15.1
+Requires(post,postun):	/sbin/chkconfig
+Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}-common = %{version}-%{release}
-Requires:	rc-scripts
-Requires:	sh-utils
 Requires:	/bin/mail
 Requires:	nagios-plugins
-Requires(post,postun):	/sbin/chkconfig
-Requires(triggerpostun):	sed >= 4.0
+Requires:	rc-scripts
+Requires:	sh-utils
 Provides:	nagios-core
-Conflicts:	iputils-ping < 1:ss020124
 Obsoletes:	netsaint
+Conflicts:	iputils-ping < 1:ss020124
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
@@ -96,17 +96,17 @@
 Summary:	Common files needed by both nagios and nrpe
 Summary(pl):	Wspólne pliki wymagane zarówno przez nagiosa jak i nrpe
 Group:		Networking
-Requires(pre):	/usr/bin/getgid
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/groupmod
 Requires(pre):	/usr/sbin/useradd
 Requires(pre):	/usr/sbin/usermod
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Provides:	user(nagios)
 Provides:	group(nagios)
 Provides:	group(nagios-data)
+Provides:	user(nagios)
 
 %description common
 Common files needed by both nagios and nrpe.
@@ -122,12 +122,12 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-imagepaks
 Requires:	%{name}-theme
-Requires:	webapps
-Requires:	webserver = apache
 Requires:	apache(mod_alias)
-Requires:	apache(mod_cgi)
 Requires:	apache(mod_auth)
+Requires:	apache(mod_cgi)
 Requires:	group(http)
+Requires:	webapps
+Requires:	webserver = apache
 
 %description cgi
 CGI webinterface for Nagios.
@@ -389,15 +389,11 @@
 
 if [ "$apache_reload" ]; then
 	/usr/sbin/webapp register apache %{_webapp}
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service apache reload
 fi
 if [ "$httpd_reload" ]; then
 	/usr/sbin/webapp register httpd %{_webapp}
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service httpd reload
 fi
 
 %files
@@ -472,6 +468,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2006/01/04 14:10:33  glen
+- use %service in trigger to respect skip auto restarts of services
+- sorted preambles
+- rel 2
+
 Revision 1.66  2005/12/21 21:36:15  djrzulf
 - rel 1, works without problems,
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.66&r2=1.67&f=u