X-Git-Url: http://git.pld-linux.org/?p=packages%2Famavisd-new.git;a=blobdiff_plain;f=amavisd-new.spec;h=c5367ed2a84c8be91ff21659fb0d0aa7e37a0386;hp=3ba89ad80a3bff3a468303ae128efcf7aab93b14;hb=0b64b70ef7542fc43ddcc9aded2152bd5d5ee4d3;hpb=b3399fd71cb71fbb6a5df88da68696c688ac97c2

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 3ba89ad..c5367ed 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,46 +1,27 @@
 # TODO:
 # - Add polish info mail templates
-# - Some perl master check what Patch1 did 
-%define		_subver	p9
 %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
 Name:		amavisd-new
-Version:	20030616
-Release:	10.1
+Version:	2.2.1
+Release:	3
+Epoch:		1
 License:	GPL
 Group:		Applications/Mail
-Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}-%{_subver}.tar.gz
-# Source0-md5:	4c96fadc57a5de84cc3bc6b548b46aff
+Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
+# Source0-md5:	567b6df37a2f049fe23c176e6fd1472f
 Source1:	%{name}.init
+Source2:	%{name}-milter.init
 Patch0:		%{name}-config.patch
-# Patch1:	%{name}-bin.patch # I don't get perl and it has rejects
-Patch3:		%{name}-cpio-reads-tar.patch
-#Patch4:		%{name}-real_sender.patch
-Patch5:		http://www.ijs.si/software/amavisd/amavisd-new-20030616-p8a.patch
+Patch1:		%{name}-dirperms.patch
+Patch2:		%{name}-lib64.patch
+Patch3:		%{name}-tools-dbdir.patch
 URL:		http://www.ijs.si/software/amavisd/
-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-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:	sendmail
-BuildRequires:	sh-utils
-BuildRequires:	unarj
-BuildRequires:	unrar
-BuildRequires:	zoo
+BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	sendmail-devel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
@@ -48,19 +29,20 @@ Requires(pre):	/usr/sbin/useradd
 Requires(postun):	/usr/sbin/userdel
 Requires(postun):	/usr/sbin/groupdel
 Requires(post,preun):	/sbin/chkconfig
-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
+Requires:	perl-Compress-Zlib
+Requires:	perl-Convert-TNEF
+Requires:	perl-Convert-UUlib
+Requires:	perl-libnet
 Requires:	perl-Mail-SpamAssassin
-#Requires:	perl-SAVI
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	perl-MIME-tools
+Requires:	perl-Net-Server
+Requires:	perl-Unix-Syslog
+Requires:	sh-utils
+Requires:	/usr/lib/sendmail
+Provides:	group(amavis)
+Provides:	user(amavis)
 Obsoletes:	AMaViS
 Obsoletes:	amavis
 Obsoletes:	amavisd
@@ -71,6 +53,7 @@ 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
@@ -87,8 +70,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
@@ -105,25 +88,31 @@ Pakiet ten zawiera back-end dla sendmaila.
 %prep
 %setup -q
 %patch0 -p1
-#%%patch1 -p1
+# %patch1 -p1
+%if "%{_lib}" == "lib64"
+%patch2 -p1
+%endif
 %patch3 -p1
-#%patch4 -p1
 
 %build
 cd helper-progs
-./configure --with-sendmail=/usr/sbin/sendmail \
+%{__autoconf}
+./configure \
+	--with-sendmail=/usr/lib/sendmail \
 	--with-runtime-dir=/var/spool/amavis/runtime \
-	--with-sockname=/var/spool/amavis/runtime/amavisd.sock
+	--with-sockname=/var/run/amavisd/amavisd.sock
 %{__make}
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run/amavisd,%{_sysconfdir}/rc.d/init.d,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,/etc/rc.d/init.d,%{_sbindir}}
 
 install amavisd $RPM_BUILD_ROOT%{_sbindir}
-install amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amavisd
+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}
 
@@ -131,30 +120,13 @@ install helper-progs/amavis-milter $RPM_BUILD_ROOT%{_sbindir}
 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
-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
-	echo "Removing group amavis."
-	/usr/sbin/groupdel amavis
+	%userremove amavis
+	%groupremove amavis
 fi
 
 %post
@@ -166,22 +138,40 @@ else
 fi
 
 %preun
-if [ "$1" = "0" ];then
+if [ "$1" = "0" ]; then
 	if [ -f /var/lock/subsys/amavisd ]; then
 		/etc/rc.d/init.d/amavisd stop >&2
 	fi
 	/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) %{_sysconfdir}/rc.d/init.d/*
-%config(noreplace) %{_sysconfdir}/amavisd.conf
+%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(755,amavis,root) %{_var}/run/amavisd
+%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