- allow specify nice name for %service macro for the service, as third argument ...

Changed files:
    rpm.macros -> 1.246

diff --git a/rpm.macros b/rpm.macros
index 01af2ca041a966ed00f0ec2b06e68405b620bf0d..e5e133650b8da5d918eb6dcf6a5d1995ef340c7c 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -778,7 +778,7 @@ if [ "$1" = "0" ] || [ "$2" = "0" ]; then \
 # All rights reserved. Permission to copy is hereby granted.. yada, yada, yada
 #
 # Usage:
-#   %service [-q] SERVICE ACTION
+#   %service [-q] SERVICE ACTION ["SERVICE NICE DESCRIPTION"]
 #
 #  -q be silent when service isn't started (for postun scriplets)
 #
@@ -793,10 +793,10 @@ if [ -f /var/lock/subsys/%1 ]; then \
        if [ $(skip_auto_restart) = no ]; then \
                /etc/rc.d/init.d/%1 %2 1>&2; \
        else \
-               echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %1 service.'; \
+               echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %{!?3:%1 service}%{?3:%(set -- %{*}; echo "$3")}.'; \
        fi \
 else \
-       %{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %1 service.';} \
+       %{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %{!?3:%1 service}%{?3:%(set -- %{*}; echo "$3")}.';} \
        %{-q::;} \
 fi }; }