SPECS (RA-branch): amavisd-new.spec - merged version 2.3.3 from HEAD

[hawk]

Author: hawk                         Date: Mon Oct 17 07:26:24 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- merged version 2.3.3 from HEAD

---- Files affected:
SPECS:
   amavisd-new.spec (1.49.2.3 -> 1.49.2.4) 

---- Diffs:

================================================================
Index: SPECS/amavisd-new.spec
diff -u SPECS/amavisd-new.spec:1.49.2.3 SPECS/amavisd-new.spec:1.49.2.4
--- SPECS/amavisd-new.spec:1.49.2.3	Thu Apr 21 11:36:58 2005
+++ SPECS/amavisd-new.spec	Mon Oct 17 09:26:17 2005
@@ -5,20 +5,23 @@
 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.2.1
-Release:	2
+Version:	2.3.3
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
-# Source0-md5:	567b6df37a2f049fe23c176e6fd1472f
+# Source0-md5:	0b02df514c1a2bf8af346bc9c7e97111
 Source1:	%{name}.init
 Source2:	%{name}-milter.init
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-dirperms.patch
-Patch2:		%{name}-tools-dbdir.patch
+Patch2:		%{name}-lib64.patch
+Patch3:		%{name}-tools-dbdir.patch
+Patch4:		%{name}-unify-log-format.patch
 URL:		http://www.ijs.si/software/amavisd/
 BuildRequires:	autoconf
+BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.127
 BuildRequires:	sendmail-devel
 Requires(pre):	/usr/bin/getgid
@@ -30,9 +33,9 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	perl-Archive-Tar
 Requires:	perl-Archive-Zip
-Requires:	perl-Compress-Zlib
+Requires:	perl-Compress-Zlib >= 1.35
 Requires:	perl-Convert-TNEF
-Requires:	perl-Convert-UUlib
+Requires:	perl-Convert-UUlib >= 1.05
 Requires:	perl-libnet
 Requires:	perl-Mail-SpamAssassin
 Requires:	perl-MIME-tools
@@ -88,7 +91,11 @@
 %setup -q
 %patch0 -p1
 # %patch1 -p1
+%if "%{_lib}" == "lib64"
 %patch2 -p1
+%endif
+%patch3 -p1
+%patch4 -p1
 
 %build
 cd helper-progs
@@ -196,6 +203,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49.2.4  2005/10/17 07:26:17  hawk
+- merged version 2.3.3 from HEAD
+
 Revision 1.49.2.3  2005/04/21 09:36:58  hawk
 - merged most of revision 0.82 from HEAD, amavisd-new 2.2.1
 - adjusted for Ra
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amavisd-new.spec?r1=1.49.2.3&r2=1.49.2.4&f=u