packages: rpm-build-macros/rpm.macros - add force flag -f to %webapp_register

[glen]

Author: glen                         Date: Fri Jul 31 11:40:57 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add force flag -f to %webapp_register

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.521 -> 1.522) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.521 packages/rpm-build-macros/rpm.macros:1.522
--- packages/rpm-build-macros/rpm.macros:1.521	Tue Jun 23 00:32:48 2009
+++ packages/rpm-build-macros/rpm.macros	Fri Jul 31 13:40:52 2009
@@ -1045,11 +1045,11 @@
 #
 # Add package's webserver config to webserver webapps dir.
 # Usage:
-#   %webapp_register WEBSERVER WEBAPP
+#   %webapp_register [-f] WEBSERVER WEBAPP
 #
-%webapp_register() \
+%webapp_register(f) \
 %{?debug:set -x; echo "webapp_register: %{name}-%{version}-%{release} 1:[$1]; 2:[$2]"} \
-if [ "$1" = "1" ] && [ "$2" = "1" ]; then\
+if [ -n "%{-f:1}" ] || [ "$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\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.521&r2=1.522&f=u