From 9cf8f53d97f1cb44049b2e4f6c6af88ee1354d4a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 1 May 2005 17:31:30 +0000
Subject: [PATCH] - use %useradd/%groupadd macros

Changed files:
    amavis-ng.spec -> 1.36
---
 amavis-ng.spec | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/amavis-ng.spec b/amavis-ng.spec
index 52a0709..29df1d2 100644
--- a/amavis-ng.spec
+++ b/amavis-ng.spec
@@ -17,7 +17,7 @@ URL:		http://amavis.sourceforge.net/
 BuildRequires:	perl-devel
 BuildRequires:	perl-libnet
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.159
+BuildRequires:	rpmbuild(macros) >= 1.202
 Requires:	perl-Config-IniFiles
 Requires: 	perl-File-MMagic
 Requires(pre):	/usr/bin/getgid
@@ -93,29 +93,12 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 if [ "$1" = "1" ]; then
 	echo
-	echo type \"info amavis-ng\" to get help
+	echo 'Type "info amavis-ng" to get help'
 	echo
 fi
 
-if [ -n "`getgid amavis`" ]; then
-	if [ "`getgid amavis`" != "97" ]; then
-		echo "Warning: group amavis doesn't have gid=97. Correct this before installing amavis" 1>&2
-		exit 1
-	fi
-else
-	echo "adding group amavis GID=97"
-	/usr/sbin/groupadd -g 97 -r -f amavis
-fi
-
-if [ -n "`id -u amavis 2>/dev/null`" ]; then
-	if [ "`id -u amavis`" != "97" ]; then
-		echo "Error: user amavis doesn't have uid=97. Correct this before installing amavis." 1>&2
-		exit 1
-	fi
-else
-	echo "adding user amavis UID=97"
-	/usr/sbin/useradd -u 97 -r -d /var/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody amavis 1>&2
-fi
+%groupadd -g 97 -r -f amavis
+%useradd -u 97 -r -d /var/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody amavis
 
 %triggerin -- courier
 chown -R daemon /var/{spool,log}/amavis-ng
-- 
2.43.0