SOURCES: rpm.macros - use %service macro in webapp macros

[glen]

Author: glen                         Date: Wed Jan 11 22:42:32 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use %service macro in webapp macros

---- Files affected:
SOURCES:
   rpm.macros (1.279 -> 1.280) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.279 SOURCES/rpm.macros:1.280
--- SOURCES/rpm.macros:1.279	Sat Dec 31 14:36:41 2005
+++ SOURCES/rpm.macros	Wed Jan 11 23:42:27 2006
@@ -727,8 +727,8 @@
 	/usr/sbin/webapp register %1 %2\
 fi\
 # reload webserver if the config symlink is there and skip reload if webserver is upgraded\
-if [ -L /etc/%1/webapps.d/%2.conf ] && [ "$2" -lt "2" ] && [ -f /var/lock/subsys/%1 ]; then\
-	/etc/rc.d/init.d/%1 reload 1>&2\
+if [ -L /etc/%1/webapps.d/%2.conf ] && [ "$2" -lt "2" ]; then\
+	%{expand:%service %%1 reload}\
 fi\
 %{nil}
 
@@ -740,9 +740,7 @@
 # remove link if either of the packages are gone \
 if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%2.conf ]; then \
 	/usr/sbin/webapp unregister %1 %2\
-	if [ -f /var/lock/subsys/%1 ]; then \
-		/etc/rc.d/init.d/%1 reload 1>&2 \
-	fi \
+	%{expand:%service %%1 reload}\
 fi \
 %{nil}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.279&r2=1.280&f=u