- added readme file for courier support

- new package amavis-courier with courier support
- use configure2_13; don't ac,am;

Changed files:
    amavis.spec -> 1.28

diff --git a/amavis.spec b/amavis.spec
index 4ada6e6cc514a7adfd09d9809a566756b76b570e..08c806136599c6cd77c94d1caf2e19a81396f60e 100644 (file)
--- a/amavis.spec
+++ b/amavis.spec
@@ -9,6 +9,7 @@ Release:        0.1
 URL:           http://www.amavis.org/
 Source0:       http://www.amavis.org/dist/perl/%{name}-%{version}.tar.gz
 # Source0-md5: 2b90dba30a5ea2b73c2b348e26967f30
+Source1:       amavis-README.courier
 License:       GPL
 Group:         Applications/Mail
 Obsoletes:     AMaViS
@@ -43,7 +44,6 @@ Requires:     unarj
 Requires:      ncompress
 Requires:      unrar
 Requires:      zoo
-Requires:      /usr/sbin/sendmail
 Obsoletes:     amavisd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,24 +55,43 @@ one or more virus scanners.
 AMaViS to skrypt po¶rednicz±cy pomiêdzy agentem transferu poczty (MTA)
 a jednym lub wiêcej programów antywirusowych.
 
+%package courier
+Summary:       A Mail Virus Scanner - courier backend
+Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla couriera
+Group:         Applications/Mail
+Requires:      amavis = %{version}-%{release}
+Requires:      courier
+Provides:      amavis-courier
+
+%description courier
+AMaViS is a script that interfaces a mail transport agent (MTA) with
+one or more virus scanners. This package contains backend for courier.
+
+%description courier -l pl
+AMaViS to skrypt po¶rednicz±cy pomiêdzy agentem transferu poczty (MTA)
+a jednym lub wiêcej programów antywirusowych.
+
 %prep
 %setup -q
 
 %build
-%{__aclocal}
-%{__automake}
-%{__autoconf}
-%configure \
+#%{__aclocal}
+#%{__autoconf}
+#%{__automake}
+%configure2_13 \
        --enable-all \
        --with-sendmail-wrapper=%{_sbindir}/sendmail \
        --with-runtime-dir=/var/spool/amavis/runtime \
        --with-virusdir=/var/spool/amavis/virusmails \
        --with-mailto="postmaster" \
+       --enable-courier \
        --with-amavisuser=amavis \
        --with-perl=%{__perl}
 
 %{__make}
 
+cp amavis/amavis amavis/amavis.courier
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,6 +99,12 @@ rm -rf $RPM_BUILD_ROOT
        amavisuser=$(id -u) \
        DESTDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} ./README.courier
+install amavis/amavis.courier $RPM_BUILD_ROOT%{_sbindir}
+
+# remove unneccessary files
+rm -f %{_sbindir}/amavis
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,6 +125,10 @@ fi
 
 %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
+%doc README README.scanners AUTHORS BUGS ChangeLog FAQ TODO doc/amavis.html doc/amavis.png
 %attr(750,amavis,root) /var/spool/amavis
+
+%files courier
+%defattr(644,root,root,755)
+%doc README.courier
+%attr(755,root,root) %{_sbindir}/amavis.courier