X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavisd-new.spec;h=f6659022a277cd06695e4398d9f4edfe6973d81a;hb=b3f2c32014e0f0709d57984115d57f87c825e344;hp=2d64bfed0adfd0f75c45c3ea327df4ab7704a7aa;hpb=e46e72f9dfe9209b62bf404a8030f74aa59c8071;p=packages%2Famavisd-new.git

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 2d64bfe..f665902 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,62 +1,62 @@
+# TODO:
+# - Add polish info mail templates
 %include	/usr/lib/rpm/macros.perl
-Summary:	A Mail Virus Scanner with SpamAssassin support - Daemon
-Summary(pl):	Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - Demon
+Summary:	A Mail Virus Scanner with SpamAssassin support - daemon
+Summary(pl):	Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - demon
 Name:		amavisd-new
-Version:	20021227
-Release:	1
+Version:	2.3.3
+Release:	6
+Epoch:		1
 License:	GPL
 Group:		Applications/Mail
-Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}-p1.tar.gz
+Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
+# Source0-md5:	0b02df514c1a2bf8af346bc9c7e97111
 Source1:	%{name}.init
+Source2:	%{name}-milter.init
 Patch0:		%{name}-config.patch
-URL:		http://www.amavis.org/
-BuildRequires:	arc
+Patch1:		%{name}-dirperms.patch
+Patch2:		%{name}-lib64.patch
+Patch3:		%{name}-tools-dbdir.patch
+Patch4:		%{name}-unify-log-format.patch
+URL:		http://www.ijs.si/software/amavisd/
 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-MIME-tools
-BuildRequires:	perl-Unix-Syslog
-BuildRequires:	perl-Convert-UUlib
-BuildRequires:	perl-Convert-TNEF
-BuildRequires:	perl-libnet
-BuildRequires:	perl-Mail-SpamAssassin
-BuildRequires:	perl-Net-Server
-BuildRequires:	sh-utils
-BuildRequires:	unarj
-BuildRequires:	unrar
-BuildRequires:	zoo
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
+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
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
 Requires:	/usr/lib/sendmail
-Requires:	arc
-Requires:	bzip2
-Requires:	file
-Requires:	lha
-Requires:	ncompress
-Requires:	sh-utils
-Requires:	unarj
-Requires:	unrar
-Requires:	zoo
+Requires:	perl-Archive-Tar
+Requires:	perl-Archive-Zip >= 1.14
+Requires:	perl-Compress-Zlib >= 1.35
+Requires:	perl-Convert-TNEF
+Requires:	perl-Convert-UUlib >= 1.05
+Requires:	perl-MIME-tools
 Requires:	perl-Mail-SpamAssassin
-#Requires:	perl-SAVI
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	perl-Net-Server
+Requires:	perl-Time-HiRes >= 1.49
+Requires:	perl-Unix-Syslog
+Requires:	perl-libnet
+Requires:	sh-utils
+Provides:	group(amavis)
+Provides:	user(amavis)
 Obsoletes:	AMaViS
 Obsoletes:	amavis
+Obsoletes:	amavisd
 Obsoletes:	amavisd-daemon
-Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-exim
-Obsoletes:	amavisd-qmail
-Obsoletes:	amavisd-new-postfix
 Obsoletes:	amavisd-new-exim
+Obsoletes:	amavisd-new-postfix
 Obsoletes:	amavisd-new-qmail
+Obsoletes:	amavisd-postfix
+Obsoletes:	amavisd-qmail
+Conflicts:	amavis-stats <= 0.1.12
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -72,8 +72,8 @@ zdemonizowana.
 Summary:	A Mail Virus Scanner with SpamAssasin support - sendmail backend
 Summary(pl):	Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:		Applications/Mail
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	sendmail
-Requires:	%{name}
 
 %description sendmail
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -90,60 +90,79 @@ Pakiet ten zawiera back-end dla sendmaila.
 %prep
 %setup -q
 %patch0 -p1
+# %patch1 -p1
+%if "%{_lib}" == "lib64"
+%patch2 -p1
+%endif
+%patch3 -p1
+%patch4 -p1
 
 %build
+cd helper-progs
+%{__autoconf}
+./configure \
+	--with-sendmail=/usr/lib/sendmail \
+	--with-runtime-dir=/var/spool/amavis/runtime \
+	--with-sockname=/var/run/amavisd/amavisd.sock
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run/amavisd,%{_sysconfdir},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,/etc/rc.d/init.d,%{_sbindir}}
 
-install amavisd{,conf} $RPM_BUILD_ROOT%{_sbindir}/
-install amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/
-install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavisd
+install amavisd $RPM_BUILD_ROOT%{_sbindir}
+install amavisd-agent $RPM_BUILD_ROOT%{_sbindir}
+install amavisd-nanny $RPM_BUILD_ROOT%{_sbindir}
+install amavisd.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/amavisd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavisd
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavis-milter
+install helper-progs/amavis $RPM_BUILD_ROOT%{_sbindir}
+install helper-progs/amavis-milter $RPM_BUILD_ROOT%{_sbindir}
 
 %clean
 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
+%groupadd -g 116 -r -f amavis
+%useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g amavis amavis
 
 %postun
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel amavis
+	%userremove amavis
+	%groupremove amavis
 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
+if [ "$1" = "0" ]; then
+	%service amavisd stop
 	/sbin/chkconfig --del amavisd
 fi
 
+%post sendmail
+/sbin/chkconfig --add amavis-milter
+%service amavis-milter restart "Amavis-milter daemon"
+
+%preun sendmail
+if [ "$1" = "0" ];then
+	%service amavis-milter stop
+	/sbin/chkconfig --del amavis-milter
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AAAREADME.first INSTALL RELEASE_NOTES README_FILES/* test-messages
 %attr(755,root,root) %{_sbindir}/amavisd*
-%attr(754,root,root) /etc/rc.d/init.d/*
-%config(noreplace) %{_sysconfdir}/amavisd.conf
-%attr(750,amavis,root) %{_var}/spool/amavis
-%attr(755,amavis,root) %{_var}/run/amavisd
-
-#%files sendmail
-#%attr(755,root,root) %{_sbindir}/amavis
-#%attr(755,root,root) %{_sbindir}/amavis-milter
+%attr(754,root,root) /etc/rc.d/init.d/amavisd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/amavisd.conf
+%attr(750,amavis,amavis) %{_var}/spool/amavis
+%attr(750,amavis,amavis) %{_var}/run/amavisd
+
+%files sendmail
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/amavis-milter
+%attr(755,root,root) %{_sbindir}/amavis
+%attr(755,root,root) %{_sbindir}/amavis-milter