- revert user changes

Changed files:
    amavisd.spec -> 1.40

diff --git a/amavisd.spec b/amavisd.spec
index 2478c1f208a544b617ebcd509004f723bde53c7e..c155b35008a86087796f677e713fbd8c792db1c2 100644 (file)
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -33,7 +33,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
@@ -240,6 +242,21 @@ 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