- add force (-f) option to %webapp_unregister

Changed files:
    rpm.macros -> 1.275

diff --git a/rpm.macros b/rpm.macros
index f84de902701f5f75d07f99671f60762fa8e2d19c..f2dc07b4dd73aeec3d9a5ab7bb666468e81532e2 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -731,11 +731,11 @@ fi\
 
 # 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 \