- rel 8 (rebuild with fixed %useradd/%groupadd macros)

[packages/amavisd.git] / amavisd.spec

diff --git a/amavisd.spec b/amavisd.spec
index fc40c92b7cdeaaead5cd803dbe5b262542349735..48796a559a118f04b50a40ee9464638443545c31 100644 (file)
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -6,7 +6,7 @@ Summary:        A Mail Virus Scanner - Daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - Demon
 Name:          amavisd
 Version:       0.1
-Release:       5
+Release:       8
 Epoch:         1
 License:       GPL
 Group:         Applications/Mail
@@ -25,28 +25,27 @@ URL:                http://www.amavis.org/
 BuildRequires: arc
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bzip2
 BuildRequires: file
 BuildRequires: lha
 BuildRequires: ncompress
 BuildRequires: perl-Archive-Tar
 BuildRequires: perl-Archive-Zip
 BuildRequires: perl-Compress-Zlib
+BuildRequires: perl-Convert-TNEF
+BuildRequires: perl-Convert-UUlib
 BuildRequires: perl-MIME-tools
 BuildRequires: perl-Unix-Syslog
-BuildRequires: perl-Convert-UUlib
-BuildRequires: perl-Convert-TNEF
 BuildRequires: perl-libnet
-BuildRequires: rpmbuild(macros) >= 1.202
-BuildRequires: sh-utils
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: unarj
 BuildRequires: unrar
 BuildRequires: zoo
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(post,preun):  /sbin/chkconfig
 Requires:      /usr/lib/sendmail
+Requires:      amavisd-daemon
 Requires:      arc
 Requires:      bzip2
 Requires:      file
@@ -56,12 +55,14 @@ Requires:   sh-utils
 Requires:      unarj
 Requires:      unrar
 Requires:      zoo
-Requires:      amavisd-daemon
 Provides:      user(amavis)
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     AMaViS
 Obsoletes:     amavis
 Obsoletes:     amavisd-new
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+# needs fix somewhere
+%undefine      with_ccache
 
 %description
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -121,15 +122,15 @@ Pakiet ten zawiera back-end dla exima.
 
 # NFY
 %package qmail
-Summary:       A Mail Virus Scanner - qmail backend.
+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-postfix
 Obsoletes:     amavisd-sendmail
 
 %description qmail
@@ -152,8 +153,8 @@ Requires:   amavisd
 Requires:      sendmail
 Provides:      amavisd-daemon
 Obsoletes:     amavisd-daemon
-Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
+Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-qmail
 
 %description sendmail
@@ -187,6 +188,7 @@ rm -f missing
 %{__automake}
 %{__autoconf}
 %configure \
+       --with-sendmail-wrapper=/usr/lib/sendmail \
        --enable-smtp \
        --enable-postfix \
        --enable-all \
@@ -201,6 +203,7 @@ rm -f missing
 mv amavis/amavisd amavis/amavisd.postfix
 
 %configure \
+       --with-sendmail-wrapper=/usr/lib/sendmail \
        --disable-smtp \
        --enable-exim \
        --enable-all \
@@ -216,6 +219,7 @@ mv amavis/amavisd amavis/amavisd.exim
 
 #NFY
 %configure \
+       --with-sendmail-wrapper=/usr/lib/sendmail \
        --disable-smtp \
        --enable-qmail \
        --enable-all \
@@ -231,6 +235,7 @@ mv amavis/amavisd amavis/amavisd.qmail
 mv amavis/amavis amavis/amavis.qmail-queue
 
 %configure \
+       --with-sendmail-wrapper=/usr/lib/sendmail \
        --disable-smtp \
        --enable-sendmail \
        --enable-all \
@@ -268,17 +273,11 @@ fi
 
 %post
 /sbin/chkconfig --add amavisd
-if [ -f /var/lock/subsys/amavisd ]; then
-       /etc/rc.d/init.d/amavisd restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/amavisd start\" to start Amavisd daemon."
-fi
+%service amavisd restart "Amavisd daemon"
 
 %preun
 if [ "$1" = "0" ];then
-       if [ -f /var/lock/subsys/amavisd ]; then
-               /etc/rc.d/init.d/amavisd stop >&2
-       fi
+       %service amavisd stop
        /sbin/chkconfig --del amavisd
 fi