- Req user-amavis

[packages/amavis.git] / amavis.spec

diff --git a/amavis.spec b/amavis.spec
index a735eab393c0685e94d386efcc0be3718923a899..a32a258fd53a0c1dcd50508da6c7ad81b88d48a7 100644 (file)
--- a/amavis.spec
+++ b/amavis.spec
@@ -4,7 +4,7 @@ Summary:        A Mail Virus Scanner
 Summary(pl):   Antywirusowy skaner poczty elektronicznej
 Name:          amavis
 Version:       11
-Release:       2
+Release:       4
 URL:           http://www.amavis.org/
 Source0:       http://www.amavis.org/dist/perl/%{name}-perl-%{version}.tar.gz
 Patch0:                %{name}-perl-mks32.patch
@@ -32,6 +32,7 @@ BuildRequires:        unarj
 BuildRequires: ncompress
 BuildRequires: unrar
 BuildRequires: zoo
+Requires(pre): user-amavis
 Requires:      file
 Requires:      sh-utils
 Requires:      arc
@@ -41,7 +42,8 @@ Requires:     unarj
 Requires:      ncompress
 Requires:      unrar
 Requires:      zoo
-Requires:      %{_sbindir}/sendmail
+Requires:      /usr/sbin/sendmail
+Obsoletes:     amavisd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,9 +60,9 @@ a jednym lub wi
 %patch1 -p1
 
 %build
-aclocal
-automake -a -c
-autoconf
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
        --enable-all \
        --with-sendmail-wrapper=%{_sbindir}/sendmail \
@@ -77,29 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        amavisuser=$(id -u) \
        DESTDIR=$RPM_BUILD_ROOT
-gzip -9nf README* AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-if [ -n "`id -u amavis 2>/dev/null`" ]; then
-       if [ "`id -u amavis`" != "97" ]; then
-               echo "Warning: user amavis haven't 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}/*
-%doc *.gz doc/*.gz doc/amavis.png
+%doc README* AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html doc/amavis.png
 %attr(750,amavis,root) /var/spool/amavis