- added Conficts: amavis-stats <= 0.1.12

[packages/amavisd-new.git] / amavisd-new.spec

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 8b5fd9e8197e45123d0e5bb39b1b267cc9a62f61..2a411329e601b539961d515562e6558adef0d380 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,13 +1,12 @@
 # TODO:
 # - Add polish info mail templates
 # - Some perl master check what Patch1 did 
-%define                _subver p9
 %include       /usr/lib/rpm/macros.perl
 Summary:       A Mail Virus Scanner with SpamAssassin support - daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - demon
 Name:          amavisd-new
 Version:       20040701
-Release:       2
+Release:       3
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
@@ -17,11 +16,17 @@ Source2:    %{name}-milter.init
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-dirperms.patch
 Patch2:                %{name}-lib64.patch
-#Patch3:               http://www.ijs.si/software/amavisd/amavisd-new-20030616-p8a.patch
 URL:           http://www.ijs.si/software/amavisd/
+BuildRequires: autoconf
+BuildRequires: sendmail-devel
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
+Requires(post,preun):  /sbin/chkconfig
 Requires:      arc
-Requires:      autoconf
-Requires:      automake
 Requires:      bzip2
 Requires:      file
 Requires:      lha
@@ -29,42 +34,18 @@ Requires:   ncompress
 Requires:      perl-Archive-Tar
 Requires:      perl-Archive-Zip
 Requires:      perl-Compress-Zlib
-Requires:      perl-MIME-tools
-Requires:      perl-Unix-Syslog
-Requires:      perl-Convert-UUlib
 Requires:      perl-Convert-TNEF
+Requires:      perl-Convert-UUlib
 Requires:      perl-libnet
 Requires:      perl-Mail-SpamAssassin
+Requires:      perl-MIME-tools
 Requires:      perl-Net-Server
+Requires:      perl-Unix-Syslog
 Requires:      sh-utils
-Requires:      sendmail-devel
 Requires:      unarj
 Requires:      unrar
 Requires:      zoo
-Requires(pre): /usr/bin/getgid
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
-Requires(post,preun):  /sbin/chkconfig
 Requires:      /usr/lib/sendmail
-Requires:      arc
-Requires:      bzip2
-Requires:      file
-Requires:      lha
-Requires:      ncompress
-Requires:      sh-utils
-Requires:      unarj
-Requires:      unrar
-Requires:      zoo
-Requires:      perl-Mail-SpamAssassin
-Requires:      perl-Convert-TNEF
-Requires:      perl-Convert-UUlib
-Requires:      perl-Compress-Zlib
-Requires:      perl-Archive-Tar
-Requires:      perl-Archive-Zip
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     AMaViS
 Obsoletes:     amavis
 Obsoletes:     amavisd
@@ -75,6 +56,7 @@ Obsoletes:    amavisd-qmail
 Obsoletes:     amavisd-new-postfix
 Obsoletes:     amavisd-new-exim
 Obsoletes:     amavisd-new-qmail
+Conflicts:     amavis-stats <= 0.1.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -91,8 +73,8 @@ zdemonizowana.
 Summary:       A Mail Virus Scanner with SpamAssasin support - sendmail backend
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:         Applications/Mail
+Requires:      %{name} = %{version}-%{release}
 Requires:      sendmail
-Requires:      %{name}
 
 %description sendmail
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -116,12 +98,12 @@ Pakiet ten zawiera back-end dla sendmaila.
 
 %build
 cd helper-progs
-autoconf
-./configure --with-sendmail=/usr/sbin/sendmail \
+%{__autoconf}
+./configure \
+       --with-sendmail=/usr/lib/sendmail \
        --with-runtime-dir=/var/spool/amavis/runtime \
        --with-sockname=/var/spool/amavis/runtime/amavisd.sock
 %{__make}
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT