- Req user-amavis

Changed files:
    amavis.spec -> 1.20

diff --git a/amavis.spec b/amavis.spec
index f590b0d039e821ecf62a44bc8b84e0c0d828c013..a32a258fd53a0c1dcd50508da6c7ad81b88d48a7 100644 (file)
--- a/amavis.spec
+++ b/amavis.spec
@@ -32,9 +32,7 @@ BuildRequires:        unarj
 BuildRequires: ncompress
 BuildRequires: unrar
 BuildRequires: zoo
 BuildRequires: ncompress
 BuildRequires: unrar
 BuildRequires: zoo

-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
+Requires(pre): user-amavis

 Requires:      file
 Requires:      sh-utils
 Requires:      arc
 Requires:      file
 Requires:      sh-utils
 Requires:      arc


@@ -85,21 +83,6 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
-

 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/*
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/*