- rewritten %%banner macro (now is much safer)

- req. macro rev. 1.175
- rel .3
- %%banner works for me

Changed files:
    rpm.macros -> 1.175
    rpm.spec -> 1.602

diff --git a/rpm.macros b/rpm.macros
index 352d041c9a7cc90a6435e9b9903925a462189728..49bf992d78955c646031e4de80f67eadf4dd7565 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -495,7 +495,13 @@ fi; \
 # -n   - no show banner (overriden by -t)
 # -t   - show only, if RPM_SCRIPTVERBOSITY >= n
 %banner(a:n:t:)        \
-       [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm || RPM_SCRIPTVERBOSITY=5; \
-       %{_bindir}/banner.sh %{!-t:%{!-n:-s}} %{-t:`[ $RPM_SCRIPTVERBOSITY -ge %{-t*} ] && echo "-s"`} %{!-a:-m}%{-a:-M} %1 << EOF\
+RPM_SCRIPTVERBOSITY=5 \
+[ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
+if [ -x /usr/bin/banner.sh ]; then \
+       CMD="/usr/bin/banner.sh %{!-t:%{!-n:-s}} %{-t:\`[ $RPM_SCRIPTVERBOSITY -ge %{-t*} ] && echo '-s'\`} %{!-a:-m}%{-a:-M} %1" \
+else \
+       CMD="cat" \
+fi \
+$CMD << EOF \
 %nil
-
+ 

diff --git a/rpm.spec b/rpm.spec
index a077b29bb7fbd463a1b7b543bf71af83ebe145e0..a7c0dab2cb07f966d9126105e6cd77ec39a70ab6 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@
 %define        reqdb_ver       4.2.50-1
 %define        reqpopt_ver     1.9
 %define        beecrypt_ver    2:4.1.0
-%define        rpm_macros_rev  1.174
+%define        rpm_macros_rev  1.175
 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
@@ -32,7 +32,7 @@ Name:         rpm
 %define        ver     4.4
 %define        sover   4.4
 Version:       %{ver}
-Release:       0.%{snap}.0.2
+Release:       0.%{snap}.0.3
 License:       GPL
 Group:         Base
 #Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz