- up to 2.4.5 - partial merged from head

- STBR

Changed files:
    amavisd-new.spec -> 1.105.2.1

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 53728b281d8a884052e19160c24e1d6fe37e970c..5bcd20fb116c16af59777d21d9946f5b889194fc 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -6,24 +6,22 @@
 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.4.2
-Release:       4
+Version:       2.4.5
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
-# Source0-md5: d750176de7481498ebd1011e08a488da
+# Source0-md5: eef8c03855f9e3a4c6c53c06006d77ea
 Source1:       %{name}.init
 Source2:       %{name}-milter.init
 Source3:       %{name}.tmpwatch
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-lib64.patch
-Patch2:                %{name}-tools-dbdir.patch
+Patch1:                %{name}-tools-dbdir.patch
 URL:           http://www.ijs.si/software/amavisd/
-BuildRequires: autoconf
+BuildRequires: libmilter-devel
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.268
-BuildRequires: sendmail-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -93,18 +91,15 @@ Pakiet ten zawiera back-end dla sendmaila.
 %prep
 %setup -q
 %patch0 -p1
-%if "%{_lib}" == "lib64"
 %patch1 -p1
-%endif
-%patch2 -p1
 
 %build
 cd helper-progs
-%{__autoconf}
-./configure \
+%configure \
        --with-sendmail=/usr/lib/sendmail \
        --with-runtime-dir=/var/spool/amavis/runtime \
-       --with-sockname=/var/run/amavisd/amavisd.sock
+       --with-sockname=/var/run/amavisd/amavisd.sock \
+       --with-milterlib=%{_libdir}
 %{__make}
 
 %install