- re-added missing chunks from revision 1.21 (set default $MYHOME to

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

diff --git a/amavisd-new.spec b/amavisd-new.spec
index a9dd361bf22babce429ec94e50b657ba850d43b1..bf94eaa52e60190086645b92cf0804ec95f65cbf 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,61 +1,66 @@
 # TODO:
 # - Add polish info mail templates
+# - move amavis part of tmpwatch configuration from tmpwatch.spec
+#
 %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:       2.3.3
-Release:       3
+Version:       2.4.2
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
-# Source0-md5: 0b02df514c1a2bf8af346bc9c7e97111
+# Source0-md5: d750176de7481498ebd1011e08a488da
 Source1:       %{name}.init
 Source2:       %{name}-milter.init
+Source3:       %{name}.tmpwatch
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-dirperms.patch
-Patch2:                %{name}-lib64.patch
-Patch3:                %{name}-tools-dbdir.patch
+Patch1:                %{name}-lib64.patch
+Patch2:                %{name}-tools-dbdir.patch
 URL:           http://www.ijs.si/software/amavisd/
 BuildRequires: autoconf
 BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sendmail-devel
-Requires(pre): /usr/bin/getgid
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
 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:      perl-Archive-Tar
-Requires:      perl-Archive-Zip
+Requires:      perl-Archive-Zip >= 1.14
 Requires:      perl-Compress-Zlib >= 1.35
 Requires:      perl-Convert-TNEF
-Requires:      perl-Convert-UUlib
-Requires:      perl-libnet
-Requires:      perl-Mail-SpamAssassin
+Requires:      perl-Convert-UUlib >= 1.05
 Requires:      perl-MIME-tools
+Requires:      perl-Mail-SpamAssassin
 Requires:      perl-Net-Server
+Requires:      perl-Time-HiRes >= 1.49
 Requires:      perl-Unix-Syslog
+Requires:      perl-libnet
 Requires:      sh-utils
-Requires:      /usr/lib/sendmail
 Provides:      group(amavis)
 Provides:      user(amavis)
 Obsoletes:     AMaViS
 Obsoletes:     amavis
 Obsoletes:     amavisd
 Obsoletes:     amavisd-daemon
-Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
-Obsoletes:     amavisd-qmail
-Obsoletes:     amavisd-new-postfix
 Obsoletes:     amavisd-new-exim
+Obsoletes:     amavisd-new-postfix
 Obsoletes:     amavisd-new-qmail
+Obsoletes:     amavisd-postfix
+Obsoletes:     amavisd-qmail
 Conflicts:     amavis-stats <= 0.1.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _tmpwatchdir    /etc/tmpwatch
+
 %description
 AMaViS is a script that interfaces a mail transport agent (MTA) with
 one or more virus scanners and SpamAssasin. This is daemonized version
@@ -88,11 +93,10 @@ Pakiet ten zawiera back-end dla sendmaila.
 %prep
 %setup -q
 %patch0 -p1
-# %patch1 -p1
 %if "%{_lib}" == "lib64"
-%patch2 -p1
+%patch1 -p1
 %endif
-%patch3 -p1
+%patch2 -p1
 
 %build
 cd helper-progs
@@ -105,7 +109,7 @@ cd helper-progs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,/etc/rc.d/init.d,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,/etc/rc.d/init.d,%{_sbindir},%{_tmpwatchdir}}
 
 install amavisd $RPM_BUILD_ROOT%{_sbindir}
 install amavisd-agent $RPM_BUILD_ROOT%{_sbindir}
@@ -115,6 +119,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavisd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavis-milter
 install helper-progs/amavis $RPM_BUILD_ROOT%{_sbindir}
 install helper-progs/amavis-milter $RPM_BUILD_ROOT%{_sbindir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_tmpwatchdir}/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,33 +136,21 @@ fi
 
 %post
 /sbin/chkconfig --add amavisd
-if [ -f /var/lock/subsys/amavisd ]; then
-       /etc/rc.d/init.d/amavisd restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/amavisd start\" to start Amavisd daemon."
-fi
+%service amavisd restart "Amavisd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/amavisd ]; then
-               /etc/rc.d/init.d/amavisd stop >&2
-       fi
+       %service amavisd stop
        /sbin/chkconfig --del amavisd
 fi
 
 %post sendmail
 /sbin/chkconfig --add amavis-milter
-if [ -f /var/lock/subsys/amavis-milter ]; then
-       /etc/rc.d/init.d/amavis-milter restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/amavis-milter start\" to start Amavis-milter daemon."
-fi
+%service amavis-milter restart "Amavis-milter daemon"
 
 %preun sendmail
 if [ "$1" = "0" ];then
-       if [ -f /var/lock/subsys/amavis-milter ]; then
-               /etc/rc.d/init.d/amavis-milter stop >&2
-       fi
+       %service amavis-milter stop
        /sbin/chkconfig --del amavis-milter
 fi
 
@@ -167,6 +160,7 @@ fi
 %attr(755,root,root) %{_sbindir}/amavisd*
 %attr(754,root,root) /etc/rc.d/init.d/amavisd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/amavisd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_tmpwatchdir}/%{name}.conf
 %attr(750,amavis,amavis) %{_var}/spool/amavis
 %attr(750,amavis,amavis) %{_var}/run/amavisd