- 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 5ce50e810f20f25657fe9a19c813e8b851ec3194..2a411329e601b539961d515562e6558adef0d380 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,48 +1,24 @@
 # 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:       20030616
-Release:       11
+Version:       20040701
+Release:       3
 License:       GPL
 Group:         Applications/Mail
-Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}-%{_subver}.tar.gz
-# Source0-md5: 4c96fadc57a5de84cc3bc6b548b46aff
+Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
+# Source0-md5: d5566eeaf1e47b6c856f4e676e93d584
 Source1:       %{name}.init
 Source2:       %{name}-milter.init
 Patch0:                %{name}-config.patch
-# Patch1:      %{name}-bin.patch # I don't get perl and it has rejects
-Patch3:                %{name}-cpio-reads-tar.patch
-# Patch4:              %{name}-real_sender.patch
-Patch5:                http://www.ijs.si/software/amavisd/amavisd-new-20030616-p8a.patch
-Patch6:                %{name}-dirperms.patch
+Patch1:                %{name}-dirperms.patch
+Patch2:                %{name}-lib64.patch
 URL:           http://www.ijs.si/software/amavisd/
-BuildRequires: arc
 BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: bzip2
-BuildRequires: file
-BuildRequires: lha
-BuildRequires: ncompress
-BuildRequires: perl-Archive-Tar
-BuildRequires: perl-Archive-Zip
-BuildRequires: perl-Compress-Zlib
-BuildRequires: perl-MIME-tools
-BuildRequires: perl-Unix-Syslog
-BuildRequires: perl-Convert-UUlib
-BuildRequires: perl-Convert-TNEF
-BuildRequires: perl-libnet
-BuildRequires: perl-Mail-SpamAssassin
-BuildRequires: perl-Net-Server
-BuildRequires: sh-utils
-BuildRequires:  sendmail-devel
-BuildRequires: unarj
-BuildRequires: unrar
-BuildRequires: zoo
+BuildRequires: sendmail-devel
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
@@ -50,19 +26,26 @@ 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:      perl-Archive-Tar
+Requires:      perl-Archive-Zip
+Requires:      perl-Compress-Zlib
+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:      unarj
 Requires:      unrar
 Requires:      zoo
-Requires:      perl-Mail-SpamAssassin
-#Requires:     perl-SAVI
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:      /usr/lib/sendmail
 Obsoletes:     AMaViS
 Obsoletes:     amavis
 Obsoletes:     amavisd
@@ -73,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
@@ -89,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
@@ -107,23 +91,26 @@ Pakiet ten zawiera back-end dla sendmaila.
 %prep
 %setup -q
 %patch0 -p1
-%patch3 -p1
-%patch6 -p1
+%patch1 -p1
+%if "%{_lib}" == "lib64"
+%patch2 -p1
+%endif
 
 %build
 cd helper-progs
-./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
-install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run/amavisd,%{_sysconfdir}/rc.d/init.d,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,%{_sysconfdir}/rc.d/init.d,%{_sbindir}}
 
 install amavisd $RPM_BUILD_ROOT%{_sbindir}
-install amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install amavisd.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/amavisd.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amavisd
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amavis-milter
 install helper-progs/amavis $RPM_BUILD_ROOT%{_sbindir}
@@ -149,7 +136,7 @@ if [ -n "`id -u amavis 2>/dev/null`" ]; then
                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