- adapterized (sorted %verify attrs)

[packages/amavisd.git] / amavisd.spec

diff --git a/amavisd.spec b/amavisd.spec
index 1d1d1b3a22a59bf986001aa98aaa794247f7932d..67a774805286511ecffcb646a01c8da235b2c2cf 100644 (file)
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -1,13 +1,17 @@
 %include       /usr/lib/rpm/macros.perl
+
+%bcond_with    qmail           # enable qmail
+
 Summary:       A Mail Virus Scanner - Daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - Demon
 Name:          amavisd
 Version:       0.1
-Release:       2
+Release:       5
 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 +20,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
@@ -27,20 +32,22 @@ 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: unarj
 BuildRequires: unrar
 BuildRequires: zoo
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
 Requires:      /usr/lib/sendmail
+Requires:      amavisd-daemon
 Requires:      arc
 Requires:      bzip2
 Requires:      file
@@ -50,10 +57,11 @@ 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
 
 %description
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -67,13 +75,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 +99,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
@@ -113,16 +121,16 @@ 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-sendmail
-Requires:      amavisd
-Requires:      qmail
 
 %description qmail
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -140,13 +148,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 +170,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 +179,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 \
@@ -250,18 +259,11 @@ install amavis/{amavisd.{exim,postfix,sendmail,qmail},amavis.qmail-queue} $RPM_B
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`id -u amavis 2>/dev/null`" ]; then
-       if [ "`id -u amavis`" != "97" ]; then
-               echo "Error: user amavis doesn't have uid=97. Correct this before installing amavis." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody  amavis 1>&2
-fi
+%useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody amavis
 
 %postun
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel amavis
+       %userremove amavis
 fi
 
 %post
@@ -299,23 +301,29 @@ ln -sf amavisd.sendmail %{_sbindir}/amavisd
 %doc README* NEWS AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html doc/amavis.png
 %attr(755,root,root) %{_sbindir}/amavis
 %attr(754,root,root) /etc/rc.d/init.d/*
-%config(noreplace) %{_sysconfdir}/amavisd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/amavisd.conf
 %attr(750,amavis,root) %{_var}/spool/amavis
 %attr(755,amavis,root) %{_var}/run/amavisd
 
 %files exim
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/amavisd.exim
 %ghost %attr(777,root,root) %{_sbindir}/amavisd
 
 %files postfix
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/amavisd.postfix
 %ghost %attr(777,root,root) %{_sbindir}/amavisd
 
+%if %{with qmail}
 %files qmail
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/amavis.qmail-queue
 %attr(755,root,root) %{_sbindir}/amavisd.qmail
 %ghost %attr(777,root,root) %{_sbindir}/amavisd
+%endif
 
 %files sendmail
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/amavisd.sendmail
 %ghost %attr(777,root,root) %{_sbindir}/amavisd