X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavis.spec;h=a32a258fd53a0c1dcd50508da6c7ad81b88d48a7;hb=0e3e024023a579421d98a109439e01f2b84e1fba;hp=d649ff4bc87a9264451dafa9ae84681a5d668e8d;hpb=7da643ca21af37e682e999d07b1f7cd47d333bb0;p=packages%2Famavis.git

diff --git a/amavis.spec b/amavis.spec
index d649ff4..a32a258 100644
--- a/amavis.spec
+++ b/amavis.spec
@@ -1,18 +1,19 @@
-%include	/usr/lib/rpm/macros.perl    
+%include	/usr/lib/rpm/macros.perl
+
 Summary:	A Mail Virus Scanner
 Summary(pl):	Antywirusowy skaner poczty elektronicznej
 Name:		amavis
 Version:	11
-Release:	1
+Release:	4
 URL:		http://www.amavis.org/
-Source0:	http://www.amavis.org/dist/%{name}-perl-%{version}.tar.gz
+Source0:	http://www.amavis.org/dist/perl/%{name}-perl-%{version}.tar.gz
+Patch0:		%{name}-perl-mks32.patch
+Patch1:		%{name}-nomilter.patch
 License:	GPL
 Group:		Applications/Mail
-Group(de):	Applikationen/Post
-Group(pl):	Aplikacje/Poczta
-Group(pt):	Aplicações/Correio Eletrônico
 Obsoletes:	AMaViS
 BuildRequires:	autoconf >= 2.52
+BuildRequires:	automake
 BuildRequires:	perl
 BuildRequires:	perl-modules
 BuildRequires:	perl-Convert-UUlib
@@ -31,6 +32,7 @@ BuildRequires:	unarj
 BuildRequires:	ncompress
 BuildRequires:	unrar
 BuildRequires:	zoo
+Requires(pre):	user-amavis
 Requires:	file
 Requires:	sh-utils
 Requires:	arc
@@ -40,7 +42,8 @@ Requires:	unarj
 Requires:	ncompress
 Requires:	unrar
 Requires:	zoo
-Requires:	%{_sbindir}/sendmail
+Requires:	/usr/sbin/sendmail
+Obsoletes:	amavisd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,9 +56,13 @@ a jednym lub wi
 
 %prep
 %setup -q -n %{name}-perl-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoconf
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
 	--enable-all \
 	--with-sendmail-wrapper=%{_sbindir}/sendmail \
@@ -66,8 +73,6 @@ autoconf
 
 %{__make}
 
-gzip -9nf README* AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,26 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 	amavisuser=$(id -u) \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/*
-%doc *.gz doc/*.gz doc/amavis.png
+%doc README* AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html doc/amavis.png
 %attr(750,amavis,root) /var/spool/amavis
-
-%pre
-if [ -n "`id -u amavis 2>/dev/null`" ]; then
-        if [ "`id -u amavis`" != "97" ]; then
-                echo "Warning: user amavis haven't 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
-
-%postun
-if [ "$1" = "0" ]; then
-        /usr/sbin/userdel amavis
-fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT