SOURCES: rpm.macros - cosmetics

[glen]

Author: glen                         Date: Sun Dec 11 14:57:25 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
SOURCES:
   rpm.macros (1.270 -> 1.271) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.270 SOURCES/rpm.macros:1.271
--- SOURCES/rpm.macros:1.270	Sat Dec 10 01:34:26 2005
+++ SOURCES/rpm.macros	Sun Dec 11 15:57:20 2005
@@ -716,7 +716,7 @@
 #
 # Add package's webserver config to webserver webapps dir.
 # Usage:
-#   %webapp_register HTTPD WEBAPP
+#   %webapp_register WEBSERVER WEBAPP
 #
 %webapp_register() \
 %{?debug:set -x; echo "webapp_register: %{name}-%{version}-%{release} 1:[$1]; 2:[$2]"} \
@@ -731,12 +731,12 @@
 
 # Remove package's config from webserver webapps dir.
 # Usage:
-#   %webapp_register HTTPD WEBAPP
+#   %webapp_register WEBSERVER WEBAPP
 %webapp_unregister() \
 %{?debug:set -x; echo "webapp_unregister: %{name}-%{version}-%{release}: 1:[$1]; 2:[$2]"} \
 # remove link if either of the packages are gone \
 if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%2.conf ]; then \
-	rm -f /etc/%1/webapps.d/%2.conf \
+	/usr/sbin/webapp unregister %1 %2\
 	if [ -f /var/lock/subsys/%1 ]; then \
 		/etc/rc.d/init.d/%1 reload 1>&2 \
 	fi \
================================================================

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