SPECS: template-webapp.spec - use %service for $SKIP_SERVICE_RESTA...

[glen]

Author: glen                         Date: Sat Jan  7 00:20:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service for $SKIP_SERVICE_RESTART to be consulted

---- Files affected:
SPECS:
   template-webapp.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/template-webapp.spec
diff -u SPECS/template-webapp.spec:1.36 SPECS/template-webapp.spec:1.37
--- SPECS/template-webapp.spec:1.36	Wed Dec 28 08:03:25 2005
+++ SPECS/template-webapp.spec	Sat Jan  7 01:20:16 2006
@@ -9,7 +9,7 @@
 #Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	-
 #URL:		-
-BuildRequires:	rpmbuild(macros) >= 1.264
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	webapps
 %if %{with trigger}
 Requires(triggerpostun):	sed >= 4.0
@@ -147,15 +147,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 -q 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 -q httpd reload
 fi
 %endif # END OF SAMPLE TRIGGER
 
@@ -176,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/01/07 00:20:16  glen
+- use %service for $SKIP_SERVICE_RESTART to be consulted
+
 Revision 1.36  2005/12/28 07:03:25  glen
 - add sample _appdir define
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-webapp.spec?r1=1.36&r2=1.37&f=u