From: pascalek <pascalek@pld-linux.org>
Date: Sat, 17 May 2003 06:37:59 +0000 (+0000)
Subject: - revert user changes
X-Git-Tag: amavisd-new-20030314-3~11
X-Git-Url: http://git.pld-linux.org/?p=packages%2Famavisd-new.git;a=commitdiff_plain;h=e46e72f9dfe9209b62bf404a8030f74aa59c8071

- revert user changes

Changed files:
    amavisd-new.spec -> 1.26
---

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 54be8f0..2d64bfe 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -31,7 +31,9 @@ BuildRequires:	sh-utils
 BuildRequires:	unarj
 BuildRequires:	unrar
 BuildRequires:	zoo
-Requires(pre):	user-amavis
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	/usr/lib/sendmail
 Requires:	arc
@@ -102,6 +104,21 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavisd
 %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