1.731: fixed %webapp_register -f to work in triggerpostun

$ if true || false && false; then echo MATCH; else echo NO MATCH; fi
NO MATCH

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index a7a50e75b96ee8df591e92f7a4e6d3bfe658bc08..ca0da9f66ef78dc6bccee4be3365852cb71f689b 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.730
+%define                rpm_macros_rev  1.731
 %define                find_lang_rev   1.40
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index f146434610c8b873b04ae0a2d2bdae71b92718d2..95c28d663e5b9c1504f78569e69b1f53354ef7e5 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1463,7 +1463,7 @@ fi;
 #
 %webapp_register(f) \
 %{?debug:set -x; echo "webapp_register: %{name}-%{version}-%{release} 1:[$1]; 2:[$2]"} \
-if [ -n "%{-f:1}" ] || [ "$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\
@@ -1478,7 +1478,7 @@ fi\
 %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/%(echo "%2" | tr '/' '-').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 \