Author: zawadaa                      Date: Thu Apr 12 22:12:58 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 2.4.5 - partial merged from head
- STBR

---- Files affected:
SPECS:
   amavisd-new.spec (1.105 -> 1.105.2.1) 

---- Diffs:

================================================================
Index: SPECS/amavisd-new.spec
diff -u SPECS/amavisd-new.spec:1.105 SPECS/amavisd-new.spec:1.105.2.1
--- SPECS/amavisd-new.spec:1.105        Fri Sep  8 20:03:48 2006
+++ SPECS/amavisd-new.spec      Fri Apr 13 00:12:53 2007
@@ -7,24 +7,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
@@ -94,18 +92,15 @@
 %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
@@ -177,6 +172,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105.2.1  2007/04/12 22:12:53  zawadaa
+- up to 2.4.5 - partial merged from head
+- STBR
+
 Revision 1.105  2006/09/08 18:03:48  glen
 - rel 4 (rebuild with fixed %useradd/%groupadd macros)
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[EMAIL PROTECTED]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to