SOURCES: rpm.macros - add force (-f) option to %webapp_unregister

[glen]

Author: glen                         Date: Thu Dec 22 14:21:39 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add force (-f) option to %webapp_unregister

---- Files affected:
SOURCES:
   rpm.macros (1.274 -> 1.275) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.274 SOURCES/rpm.macros:1.275
--- SOURCES/rpm.macros:1.274	Thu Dec 22 15:20:42 2005
+++ SOURCES/rpm.macros	Thu Dec 22 15:21:34 2005
@@ -731,11 +731,11 @@
 
 # Remove package's config from webserver webapps dir.
 # Usage:
-#   %webapp_register WEBSERVER WEBAPP
-%webapp_unregister() \
+#   %webapp_register [-f] WEBSERVER WEBAPP
+%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 [ "$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/%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 \
================================================================

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