SPECS: nagios.spec - lib64 safe resource.cfg, rel 2

[glen]

Author: glen                         Date: Tue Mar 14 15:06:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lib64 safe resource.cfg, rel 2

---- Files affected:
SPECS:
   nagios.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/nagios.spec
diff -u SPECS/nagios.spec:1.73 SPECS/nagios.spec:1.74
--- SPECS/nagios.spec:1.73	Tue Mar 14 15:48:12 2006
+++ SPECS/nagios.spec	Tue Mar 14 16:06:18 2006
@@ -7,7 +7,7 @@
 Summary(pt_BR):	Programa para monitoraçăo de máquinas e serviços
 Name:		nagios
 Version:	2.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
@@ -215,6 +215,7 @@
 
 # install templated configuration files
 tar jxf %{SOURCE5} --strip-components=1 -C $RPM_BUILD_ROOT%{_sysconfdir}
+sed -i -e 's,%{_prefix}/lib/,%{_libdir}/,' $RPM_BUILD_ROOT%{_sysconfdir}/resource.cfg
 
 # webserver files
 install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
@@ -243,7 +244,7 @@
 done
 
 /sbin/chkconfig --add %{name}
-%service %{name} restart
+%service %{name} restart "Nagios service"
 
 %preun
 if [ "$1" = "0" ] ; then
@@ -332,7 +333,7 @@
 chown nagios:nagios %{_localstatedir}/nagios.pid 2>/dev/null
 chown nagios:nagios-data %{_localstatedir}/rw/nagios.cmd 2>/dev/null
 
-%service %{name} restart
+%service -q %{name} restart
 
 %banner -e %{name}-2.0 <<'EOF'
 Please read <http://nagios.sourceforge.net/docs/2_0/whatsnew.html>
@@ -385,11 +386,11 @@
 
 if [ "$apache_reload" ]; then
 	/usr/sbin/webapp register apache %{_webapp}
-	%service apache reload
+	%service -q apache reload
 fi
 if [ "$httpd_reload" ]; then
 	/usr/sbin/webapp register httpd %{_webapp}
-	%service httpd reload
+	%service -q httpd reload
 fi
 
 %files
@@ -464,6 +465,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2006/03/14 15:06:18  glen
+- lib64 safe resource.cfg, rel 2
+
 Revision 1.73  2006/03/14 14:48:12  glen
 - lib64 safe apache config
 
================================================================

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