SOURCES: rpm.macros - fix webapps module restart

[glen]

Author: glen                         Date: Mon Jun 12 09:37:22 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix webapps module restart

---- Files affected:
SOURCES:
   rpm.macros (1.306 -> 1.307) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.306 SOURCES/rpm.macros:1.307
--- SOURCES/rpm.macros:1.306	Sat Jun 10 18:57:53 2006
+++ SOURCES/rpm.macros	Mon Jun 12 11:37:16 2006
@@ -744,7 +744,7 @@
 	/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" ]; then\
+if [ -L /etc/%1/webapps.d/%(echo "%2" | tr '/' '-').conf ] && [ "$2" -lt "2" ]; then\
 	%{expand:%service -q %%1 reload}\
 fi\
 %{nil}
@@ -755,7 +755,7 @@
 %webapp_unregister(f) \
 %{?debug:set -x; echo "webapp_unregister: %{name}-%{version}-%{release}: 1:[$1]; 2:[$2]"} \
 # 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 \
+if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%(echo "%2" | tr '/' '-').conf ]; then \
 	/usr/sbin/webapp unregister %1 %2\
 	%{expand:%service -q %%1 reload}\
 fi \
================================================================

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