X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=amavisd.spec;h=5b4bdd602ad07dd5e1218e76d4c82dc9bfacf50d;hb=e059f542ac64fd52168ee605fc363fe3e9a34d04;hp=fdf1b4ad60645fdab6ff1ace85331bcb44d42726;hpb=ef8ed824d2efc0a517f47add709b1fd6643bc986;p=packages%2Famavisd.git

diff --git a/amavisd.spec b/amavisd.spec
index fdf1b4a..5b4bdd6 100644
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -1,17 +1,14 @@
-%include	/usr/lib/rpm/macros.perl    
+%include	/usr/lib/rpm/macros.perl
 Summary:	A Mail Virus Scanner - Daemon.
 Summary(pl):	Antywirusowy skaner poczty elektronicznej - Demon
 Name:		amavisd
 Version:	20010714
-Release:	1
-URL:		http://www.amavis.org/
-Source0:	http://www.amavis.org/dist/perl/%{name}-snapshot-%{version}.tar.gz
-Source1:	%{name}.init
+Release:	4
 License:	GPL
 Group:		Applications/Mail
-Group(de):	Applikationen/Post
-Group(pl):	Aplikacje/Poczta
-Group(pt):	Aplicações/Correio Eletrônico
+Source0:	http://www.amavis.org/dist/perl/%{name}-snapshot-%{version}.tar.gz
+Source1:	%{name}.init
+URL:		http://www.amavis.org/
 BuildRequires:	arc
 BuildRequires:	autoconf
 BuildRequires:	bzip2
@@ -23,7 +20,6 @@ BuildRequires:	perl-Archive-Zip
 BuildRequires:	perl-Compress-Zlib
 BuildRequires:	perl-MIME-tools
 BuildRequires:	perl-Unix-Syslog
-BuildRequires:	perl-devel
 BuildRequires:	perl-Convert-UUlib
 BuildRequires:	perl-Convert-TNEF
 BuildRequires:	sh-utils
@@ -32,7 +28,7 @@ BuildRequires:	unrar
 BuildRequires:	zoo
 Obsoletes:	AMaViS
 Obsoletes:	amavis
-Requires:	%{_sbindir}/sendmail
+Requires:	%{_libdir}/sendmail
 Requires:	arc
 Requires:	bzip2
 Requires:	file
@@ -58,11 +54,11 @@ a jednym lub wi
 %build
 autoconf
 %configure \
-	--enable-relay \
 	--enable-smtp \
 	--enable-all \
 	--enable-syslog \
 	--with-runtime-dir=%{_var}/spool/amavis/runtime \
+	--with-virusdir=%{_var}/spool/amavis/virusmails \
 	--with-logdir=%{_var}/log \
 	--with-amavisuser=amavis \
 	--with-sockname=%{_var}/run/amavisd/amavisd.sock
@@ -85,7 +81,7 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/amavisd
 %attr(755,root,root) %{_sbindir}/amavis
 %attr(754,root,root) %{_sysconfdir}/rc.d/init.d/*
-%config(noreplace) %{_sysconfdir}/amavisd.conf 
+%config(noreplace) %{_sysconfdir}/amavisd.conf
 %doc *.gz doc/*.gz doc/amavis.png
 %attr(750,amavis,root) %{_var}/spool/amavis
 %attr(755,amavis,root) %{_var}/run/amavisd
@@ -109,15 +105,15 @@ fi
 /sbin/chkconfig --add amavisd
 
 if [ -f %{_var}/lock/subsys/amavisd ]; then
-        %{_sysconfdir}/rc.d/init.d/amavisd restart >&2
+        /etc/rc.d/init.d/amavisd restart >&2
 else
-        echo "Run \"%{_sysconfdir}/rc.d/init.d/amavisd start\" to start Amavisd daemon."
+        echo "Run \"/etc/rc.d/init.d/amavisd start\" to start Amavisd daemon."
 fi
 
 %preun
 if [ "$1" = "0" ];then
         if [ -f %{_var}/lock/subsys/amavisd ]; then
-                %{_sysconfdir}/rc.d/init.d/amavisd stop >&2
+                /etc/rc.d/init.d/amavisd stop >&2
         fi
         /sbin/chkconfig --del amavisd
 fi