From: pascalek <pascalek@pld-linux.org>
Date: Sat, 10 May 2003 09:18:57 +0000 (+0000)
Subject: - Req user-amavis
X-Git-Tag: auto/ac/amavisd-0_1-6~8
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=285ea67149b4d7f5ece279103b19cfe1fa2bb3e3;p=packages%2Famavisd.git

- Req user-amavis

Changed files:
    amavisd.spec -> 1.39
---

diff --git a/amavisd.spec b/amavisd.spec
index 5c7bc9a..2478c1f 100644
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -33,10 +33,8 @@ BuildRequires:	sh-utils
 BuildRequires:	unarj
 BuildRequires:	unrar
 BuildRequires:	zoo
-Requires(pre):	/bin/id
-Requires(pre):	/usr/sbin/useradd
+Requires(pre):	user-amavis
 Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	/usr/sbin/userdel
 Requires:	/usr/lib/sendmail
 Requires:	arc
 Requires:	bzip2
@@ -242,21 +240,6 @@ install amavis/amavisd.{exim,postfix,sendmail} $RPM_BUILD_ROOT%{_sbindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-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
-	/usr/sbin/useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody  amavis 1>&2
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-	/usr/sbin/userdel amavis
-fi
-
 %post
 /sbin/chkconfig --add amavisd
 if [ -f /var/lock/subsys/amavisd ]; then