- use %service macro in webapp macros

Changed files:
    rpm.macros -> 1.280

diff --git a/rpm.macros b/rpm.macros
index a60d30c1235fea81abe6fae7c72bc920f202e7f5..4a520d92c6dedfd885ec9e28aebbf5e3beaf4f22 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -727,8 +727,8 @@ if [ "$1" = "1" ] && [ "$2" = "1" ]; then\
        /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 @@ fi\
 # 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}