- merge %useradd/%groupadd from AC-branch

Changed files:
    rpm.macros -> 1.208

diff --git a/rpm.macros b/rpm.macros
index ff50d047ccdec0783a8b0e949ec54577fe8f8015..a726143bf567e0898eb82a58dfd15c29e0cc1b24 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -585,11 +585,6 @@ fi \
 $CMD %2%{?3: %3} \
 %nil
 
-# fatal macro. produces recursion and therefore stops rpm build.
-# until there's no legal way of stopping rpmbuild from macros, this is used by
-# %useradd/%groupadd to notify user of wrong usage. glen@pld-linux.org
-%fatal() { %{*} %fatal }
-
 # useradd/groupadd macros written by glen@pld-linux.org.
 # All rights reserved. Permission to copy is hereby granted.. yada, yada, yada
 #
@@ -607,9 +602,9 @@ $CMD %2%{?3: %3} \
 #  -P package name. defaults to %{name}
 #
 %useradd(c:d:e:f:g:G:Mmk:op:s:u:rP:) \
-%{!-u:%fatal -- useradd: Required argument -u missing} \
-%{!-g:%fatal -- useradd: Required argument -g missing} \
-%{!?1:%fatal -- useradd: Required parameter login missing} \
+%{!-u:%{error:useradd: Required argument -u missing}} \
+%{!-g:%{error:useradd: Required argument -g missing}} \
+%{!?1:%{error:useradd: Required parameter login missing}} \
 if [ -n "`/bin/id -u %{expand:%{%{#}}} 2>/dev/null`" ]; then \
        if [ "`/bin/id -u %{expand:%{%{#}}}`" != "%{-u*}" ]; then \
                echo "Error: user %{expand:%{%{#}}} doesn't have uid=%{-u*}. Correct this before installing %{-P*}%{!?-P:%{name}}." 1>&2 \
@@ -638,8 +633,8 @@ fi;
 #   %groupadd -P %{name}-base -g %{gid} %{name}
 
 %groupadd(g:P:rfo)     \
-%{!-g:%fatal -- groupadd: Required argument -g missing} \
-%{!?1:%fatal -- groupadd: Required parameter group missing} \
+%{!-g:%{error:groupadd: Required argument -g missing}} \
+%{!?1:%{error:groupadd: Required parameter group missing}} \
 if [ -n "`/usr/bin/getgid %{1}`" ]; then \
        if [ "`/usr/bin/getgid %{1}`" != "%{-g*}" ]; then \
                echo "Error: group %{1} doesn't have gid=%{-g*}. Correct this before installing %{-P*}%{!?-P:%{name}}." 1>&2 \