cosmetics

[packages/amavis.git] / amavis.spec

diff --git a/amavis.spec b/amavis.spec
index 91af827b4959284683cb557c9b36a03258c4b915..e2b47ca9d32455b8063321bdfcf131cd79d4c2bc 100644 (file)
--- a/amavis.spec
+++ b/amavis.spec
@@ -1,12 +1,13 @@
-
 %include       /usr/lib/rpm/macros.perl
+
 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
+# Source0-md5: e19bfabb2da4aeccc8227766995442d5
 Patch0:                %{name}-perl-mks32.patch
 Patch1:                %{name}-nomilter.patch
 License:       GPL
@@ -14,7 +15,6 @@ Group:                Applications/Mail
 Obsoletes:     AMaViS
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
-BuildRequires: perl
 BuildRequires: perl-modules
 BuildRequires: perl-Convert-UUlib
 BuildRequires: perl-Convert-TNEF
@@ -32,6 +32,9 @@ BuildRequires:        unarj
 BuildRequires: ncompress
 BuildRequires: unrar
 BuildRequires: zoo
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
 Requires:      file
 Requires:      sh-utils
 Requires:      arc
@@ -41,7 +44,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,21 +62,20 @@ a jednym lub wi
 %patch1 -p1
 
 %build
-aclocal
-automake -a -c
-autoconf
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
        --enable-all \
        --with-sendmail-wrapper=%{_sbindir}/sendmail \
        --with-runtime-dir=/var/spool/amavis/runtime \
        --with-virusdir=/var/spool/amavis/virusmails \
        --with-mailto="postmaster" \
-       --with-amavisuser=amavis
+       --with-amavisuser=amavis \
+       --with-perl=%{__perl}
 
 %{__make}
 
-gzip -9nf README* AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,26 +83,26 @@ rm -rf $RPM_BUILD_ROOT
        amavisuser=$(id -u) \
        DESTDIR=$RPM_BUILD_ROOT
 
-%files
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
-%doc *.gz doc/*.gz doc/amavis.png
-%attr(750,amavis,root) /var/spool/amavis
+%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
+       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
+       /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
+       /usr/sbin/userdel amavis
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/*
+%doc README* AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html doc/amavis.png
+%attr(750,amavis,root) /var/spool/amavis