X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavisd-new.spec;h=2a411329e601b539961d515562e6558adef0d380;hb=7c24589078e9cc593986f5013100f4cb514365f1;hp=a8c60cfa37abafa31ad893c1b3f798cc937829fa;hpb=ce926ae3aa3d14ad6f0e167d2c827cfb6f81924c;p=packages%2Famavisd-new.git

diff --git a/amavisd-new.spec b/amavisd-new.spec
index a8c60cf..2a41132 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,56 +1,54 @@
+# TODO:
+# - Add polish info mail templates
+# - Some perl master check what Patch1 did 
 %include	/usr/lib/rpm/macros.perl
-Summary:	A Mail Virus Scanner with SpamAssasin 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:	0.1
+Version:	20040701
+Release:	3
 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:	d5566eeaf1e47b6c856f4e676e93d584
 Source1:	%{name}.init
-Patch0:		%{name}-notest-mta.patch
-Patch1:		%{name}-paths.patch
-URL:		http://www.amavis.org/
-BuildRequires:	arc
+Source2:	%{name}-milter.init
+Patch0:		%{name}-config.patch
+Patch1:		%{name}-dirperms.patch
+Patch2:		%{name}-lib64.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-Vipuls-Razor-V1
-BuildRequires:	perl-Net-Server
-BuildRequires:	sh-utils
-BuildRequires:	unarj
-BuildRequires:	unrar
-BuildRequires:	zoo
+BuildRequires:	sendmail-devel
+Requires(pre):	/usr/bin/getgid
 Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/userdel
-Requires:	/usr/lib/sendmail
+Requires(postun):	/usr/sbin/groupdel
+Requires(post,preun):	/sbin/chkconfig
 Requires:	arc
 Requires:	bzip2
 Requires:	file
 Requires:	lha
 Requires:	ncompress
+Requires:	perl-Archive-Tar
+Requires:	perl-Archive-Zip
+Requires:	perl-Compress-Zlib
+Requires:	perl-Convert-TNEF
+Requires:	perl-Convert-UUlib
+Requires:	perl-libnet
+Requires:	perl-Mail-SpamAssassin
+Requires:	perl-MIME-tools
+Requires:	perl-Net-Server
+Requires:	perl-Unix-Syslog
 Requires:	sh-utils
 Requires:	unarj
 Requires:	unrar
 Requires:	zoo
-Requires:	perl-Mail-SpamAssassin
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	/usr/lib/sendmail
 Obsoletes:	AMaViS
 Obsoletes:	amavis
+Obsoletes:	amavisd
 Obsoletes:	amavisd-daemon
 Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-exim
@@ -58,6 +56,8 @@ Obsoletes:	amavisd-qmail
 Obsoletes:	amavisd-new-postfix
 Obsoletes:	amavisd-new-exim
 Obsoletes:	amavisd-new-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
@@ -73,8 +73,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} = %{version}-%{release}
 Requires:	sendmail
-Requires:	%{name}
 
 %description sendmail
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -92,33 +92,58 @@ Pakiet ten zawiera back-end dla sendmaila.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if "%{_lib}" == "lib64"
+%patch2 -p1
+%endif
 
 %build
+cd helper-progs
+%{__autoconf}
+./configure \
+	--with-sendmail=/usr/lib/sendmail \
+	--with-runtime-dir=/var/spool/amavis/runtime \
+	--with-sockname=/var/spool/amavis/runtime/amavisd.sock
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run/amavisd,%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,%{_sysconfdir}/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.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/amavisd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amavisd
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/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 "`getgid amavis`" ]; then
+	if [ "`getgid amavis`" != "116" ]; then
+		echo "Error: group amavis doesn't have gid=116. Correct this before installing amavisd-new." 1>&2
+		exit 1
+	fi
+else
+	echo "adding group amavis GID=116."
+	/usr/sbin/groupadd -g 116 -r -f amavis
+fi
+
 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
+	/usr/sbin/useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody amavis 1>&2
 fi
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/userdel amavis
+	echo "Removing group amavis."
+	/usr/sbin/groupdel amavis
 fi
 
 %post
@@ -137,15 +162,35 @@ if [ "$1" = "0" ];then
 	/sbin/chkconfig --del amavisd
 fi
 
+%post sendmail
+/sbin/chkconfig --add amavis-milter
+if [ -f /var/lock/subsys/amavis-milter ]; then
+	/etc/rc.d/init.d/amavis-milter restart >&2
+else
+	echo "Run \"/etc/rc.d/init.d/amavis-milter start\" to start Amavis-milter daemon."
+fi
+
+
+%preun sendmail
+if [ "$1" = "0" ];then
+	if [ -f /var/lock/subsys/amavis-milter ]; then
+		/etc/rc.d/init.d/amavis-milter stop >&2
+	fi
+	/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/*
+%attr(755,root,root) %{_sbindir}/amavisd*
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/amavisd
 %config(noreplace) %{_sysconfdir}/amavisd.conf
-%attr(750,amavis,root) %{_var}/spool/amavis
+%attr(750,amavis,amavis) %{_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
+%files sendmail
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/amavis-milter
+%attr(755,root,root) %{_sbindir}/amavis
+%attr(755,root,root) %{_sbindir}/amavis-milter