- adapterized (sorted %verify attrs)

[packages/amavisd.git] / amavisd.spec

diff --git a/amavisd.spec b/amavisd.spec
index 631d489129ada06e29c6d6c128bc74773159aab3..67a774805286511ecffcb646a01c8da235b2c2cf 100644 (file)
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -32,21 +32,22 @@ BuildRequires:      ncompress
 BuildRequires: perl-Archive-Tar
 BuildRequires: perl-Archive-Zip
 BuildRequires: perl-Compress-Zlib
+BuildRequires: perl-Convert-TNEF
+BuildRequires: perl-Convert-UUlib
 BuildRequires: perl-MIME-tools
 BuildRequires: perl-Unix-Syslog
-BuildRequires: perl-Convert-UUlib
-BuildRequires: perl-Convert-TNEF
 BuildRequires: perl-libnet
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: sh-utils
 BuildRequires: unarj
 BuildRequires: unrar
 BuildRequires: zoo
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
 Requires:      /usr/lib/sendmail
+Requires:      amavisd-daemon
 Requires:      arc
 Requires:      bzip2
 Requires:      file
@@ -56,7 +57,6 @@ Requires:     sh-utils
 Requires:      unarj
 Requires:      unrar
 Requires:      zoo
-Requires:      amavisd-daemon
 Provides:      user(amavis)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     AMaViS
@@ -121,7 +121,7 @@ Pakiet ten zawiera back-end dla exima.
 
 # NFY
 %package qmail
-Summary:       A Mail Virus Scanner - qmail backend.
+Summary:       A Mail Virus Scanner - qmail backend
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla qmaila
 Group:         Applications/Mail
 Requires:      amavisd
@@ -259,14 +259,7 @@ install amavis/{amavisd.{exim,postfix,sendmail,qmail},amavis.qmail-queue} $RPM_B
 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
+%useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody amavis
 
 %postun
 if [ "$1" = "0" ]; then
@@ -308,7 +301,7 @@ ln -sf amavisd.sendmail %{_sbindir}/amavisd
 %doc README* NEWS AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html doc/amavis.png
 %attr(755,root,root) %{_sbindir}/amavis
 %attr(754,root,root) /etc/rc.d/init.d/*
-%config(noreplace) %{_sysconfdir}/amavisd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/amavisd.conf
 %attr(750,amavis,root) %{_var}/spool/amavis
 %attr(755,amavis,root) %{_var}/run/amavisd