- back to 20020517 (20020630 is broken, it has harcoded score)

Changed files:
    amavisd-new.spec -> 1.12

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 79116ef311b9edec2136ef920e56d9c9409d9b31..3677d79801fa574f7fa8e57b02f74c72fed130b4 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -2,8 +2,8 @@
 Summary:       A Mail Virus Scanner with SpamAssasin support - Daemon.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - Demon
 Name:          amavisd-new
-Version:       20020630
-Release:       4
+Version:       20020517
+Release:       2
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
@@ -13,9 +13,7 @@ Patch1:               %{name}-nomilter.patch
 Patch2:                %{name}-qmail.patch
 Patch3:                %{name}-clamav.patch
 Patch4:                %{name}-paths.patch
-Patch5:                %{name}-avp.patch
-Patch6:                %{name}-config.patch
-URL:           http://www.ijs.si/software/amavisd/
+URL:           http://www.amavis.org/
 BuildRequires: arc
 BuildRequires: autoconf
 BuildRequires:  automake
@@ -30,7 +28,7 @@ BuildRequires:        perl-MIME-tools
 BuildRequires: perl-Unix-Syslog
 BuildRequires: perl-Convert-UUlib
 BuildRequires: perl-Convert-TNEF
-BuildRequires: perl-libnet >= 1:1.12
+BuildRequires: perl-libnet
 BuildRequires: perl-Mail-SpamAssassin
 BuildRequires: perl-Vipuls-Razor-V1
 BuildRequires: perl-Net-Server
@@ -54,7 +52,7 @@ Requires:     unrar
 Requires:      zoo
 Requires:      perl-Mail-SpamAssassin
 Requires:      perl-Vipuls-Razor-V1
-Requires:      amavisd-new-daemon
+Requires:      amavisd-daemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     AMaViS
 Obsoletes:     amavis
@@ -73,9 +71,8 @@ Wersja zdemonizowana.
 Summary:       A Mail Virus Scanner with SpamAssasin support - postfix back-end.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - back-end dla postfiksa
 Group:         Applications/Mail
-Provides:      amavisd-new-daemon
+Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
-Obsoletes:     amavisd-new-daemon
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
@@ -97,9 +94,8 @@ Pakiet ten zawiera back-end dla postfiks.
 Summary:       A Mail Virus Scanner with SpamAssasin support - exim backend.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla exima
 Group:         Applications/Mail
-Provides:      amavisd-new-daemon
+Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
-Obsoletes:     amavisd-new-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
@@ -122,9 +118,8 @@ Pakiet ten zawiera back-end dla exima.
 #Summary:      A Mail Virus Scanner - qmail backend.
 #Summary(pl):  Antywirusowy skaner poczty elektronicznej - backend dla qmaila
 #Group:                Applications/Mail
-#Provides:     amavisd-new-daemon
+#Provides:     amavisd-daemon
 #Obsoletes:    amavisd-daemon
-#Obsoletes:    amavisd-new-daemon
 #Obsoletes:    amavisd-postfix
 #Obsoletes:    amavisd-exim
 #Obsoletes:    amavisd-sendmail
@@ -146,9 +141,8 @@ Pakiet ten zawiera back-end dla exima.
 Summary:       A Mail Virus Scanner with SpamAssasin support - sendmail backend.
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:         Applications/Mail
-Provides:      amavisd-new-daemon
+Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
-Obsoletes:     amavisd-new-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
@@ -168,13 +162,12 @@ Pakiet ten zawiera back-end dla sendmaila.
 
 %prep
 %setup -q -n %{name}-%{version}
+cp -a amavis/amavisd.in.all amavis/amavisd.in
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 aclocal