- some Provides/Obsoletes cleanups

[packages/amavisd.git] / amavisd.spec

diff --git a/amavisd.spec b/amavisd.spec
index 1d1d1b3a22a59bf986001aa98aaa794247f7932d..ee9fe910752b2cbfdf585dc062be1f152a537db6 100644 (file)
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -3,11 +3,12 @@ Summary:      A Mail Virus Scanner - Daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - Demon
 Name:          amavisd
 Version:       0.1
-Release:       2
+Release:       3
 Epoch:         1
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://www.amavis.org/dist/perl/%{name}-%{version}.tar.gz
+# Source0-md5: 432a32bfc6d473564f49028b540f53ad
 Source1:       %{name}.init
 Patch0:                %{name}-notest-mta.patch
 Patch1:                %{name}-nomilter.patch
@@ -16,6 +17,7 @@ Patch3:               %{name}-mks_vir.patch
 Patch4:                %{name}-clamav.patch
 Patch5:                %{name}-mks_vir-mksd.patch
 Patch6:                %{name}-qmail-new.patch
+Patch7:                %{name}-acx_pthread.patch
 URL:           http://www.amavis.org/
 BuildRequires: arc
 BuildRequires: autoconf
@@ -54,6 +56,7 @@ Requires:     amavisd-daemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     AMaViS
 Obsoletes:     amavis
+Obsoletes:     amavisd-new
 
 %description
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -67,13 +70,13 @@ a jednym lub wi
 Summary:       A Mail Virus Scanner - postfix back-end
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - back-end dla postfiksa
 Group:         Applications/Mail
+Requires:      amavisd
+Requires:      postfix
 Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
-Requires:      amavisd
-Requires:      postfix
 
 %description postfix
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -91,13 +94,13 @@ Pakiet ten zawiera back-end dla postfiks.
 Summary:       A Mail Virus Scanner - exim backend
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla exima
 Group:         Applications/Mail
+Requires:      amavisd
+Requires:      exim
 Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
-Requires:      amavisd
-Requires:      exim
 
 %description exim
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -116,13 +119,13 @@ 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
+Requires:      amavisd
+Requires:      qmail
 Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-sendmail
-Requires:      amavisd
-Requires:      qmail
 
 %description qmail
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -140,13 +143,13 @@ Pakiet ten zawiera back-end dla qmaila.
 Summary:       A Mail Virus Scanner - sendmail backend
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:         Applications/Mail
+Requires:      amavisd
+Requires:      sendmail
 Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
-Requires:      amavisd
-Requires:      sendmail
 
 %description sendmail
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -162,7 +165,7 @@ Pakiet ten zawiera back-end dla sendmaila.
 
 %define no_install_post_chrpath 1
 %prep
-%setup -q 
+%setup -q
 #-n %{name}-snapshot-%{version}
 #%patch0 -p1
 #%patch1 -p1
@@ -171,12 +174,13 @@ Pakiet ten zawiera back-end dla sendmaila.
 #%patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 rm -f missing
 %{__aclocal}
-%{__autoconf}
 %{__automake}
+%{__autoconf}
 %configure \
        --enable-smtp \
        --enable-postfix \