From 628754cb614e4920384358590c43920af88a92ce Mon Sep 17 00:00:00 2001
From: pzurowski <pzurowski@pld-linux.org>
Date: Fri, 26 Nov 2004 00:57:57 +0000
Subject: [PATCH] - changed behaviour in -n and -t in %%banner - added banner
 support to user_group.sh (PLEASE CHECK!)

Changed files:
    rpm.macros -> 1.177
---
 rpm.macros | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpm.macros b/rpm.macros
index 7ecda9b..ab87e93 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -493,16 +493,16 @@ fi; \
 # EOF
 # -a   - append to the banner
 # -e   - send to stderr instead of stdout
-# -n   - no show banner (overriden by -t)
-# -t   - show only, if RPM_SCRIPTVERBOSITY >= n
+# -n   - no show banner (overrides -t)
+# -t   - show only, if RPM_SCRIPTVERBOSITY >= n; default n=5
 %banner(a:e:n:t:)	\
 RPM_SCRIPTVERBOSITY=5 \
 [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
 if [ -x /usr/bin/banner.sh ]; then \
-	CMD="/usr/bin/banner.sh %{-e:--stderr} %{!-t:%{!-n:-s}} %{-t:\`[ $RPM_SCRIPTVERBOSITY -ge %{-t*} ] && echo '-s'\`} %{!-a:-m}%{-a:-M} %1" \
+	CMD="/usr/bin/banner.sh %{-e:--stderr} %{!-n:\`[ $RPM_SCRIPTVERBOSITY -ge %{-t:%{-t*}}%{!-t:5} ] && echo '-s'\`} %{!-a:-m}%{-a:-M} %1" \
 else \
 	CMD="cat%{-e: >&2}" \
 fi \
 $CMD << EOF \
 %nil
- 
+
-- 
2.44.0