X-Git-Url: http://git.pld-linux.org/?p=packages%2Famavis-ng.git;a=blobdiff_plain;f=amavis-ng.spec;h=52f34a484cbedfd10c822c7ab268d3b4a158b116;hp=944d025706139b09fb8bed922567f2a0a3e3fa15;hb=2026bf163204aa71d9467fcd04f15731f80f0995;hpb=7fbd9dd6b6acf0d67274e5993bdf8a317d55ebf6

diff --git a/amavis-ng.spec b/amavis-ng.spec
index 944d025..52f34a4 100644
--- a/amavis-ng.spec
+++ b/amavis-ng.spec
@@ -1,40 +1,44 @@
 %include	/usr/lib/rpm/macros.perl
+%define		pdir	AMAVIS
 Summary:	New generation amavis
-Summary(pl):	Amavis nowej generacji
+Summary(pl.UTF-8):	Amavis nowej generacji
 Name:		amavis-ng
-Version:	0.1.6.4.orig
+Version:	0.1.6.9
 Release:	3
 License:	GPL
 Group:		Applications/Mail
-Source0:	http://dl.sourceforge.net/amavis/%{name}_%{version}.tar.gz
-# Source0-md5:	b3559a910bad4a522a466da3a44e62c6
+Source0:	http://dl.sourceforge.net/amavis/%{name}-%{version}.tar.gz
+# Source0-md5:	e9086bfbd3fa2049860d176a0c30549e
 Source1:	%{name}-logrotate
 Patch0:		%{name}-quarantine.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-courier.patch
 Patch3:		%{name}-mks.patch
+Patch4:		%{name}-make.patch
 URL:		http://amavis.sourceforge.net/
-BuildRequires:	perl-Config-IniFiles
-BuildRequires:	perl-File-MMagic
 BuildRequires:	perl-devel
 BuildRequires:	perl-libnet
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.159
-Requires(pre):	/usr/bin/getgid
+BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	sendmail-devel
+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(postun):	/usr/sbin/userdel
-Requires(postun):	/usr/sbin/groupdel
+Requires:	perl-Config-IniFiles
+Requires:	perl-File-MMagic
 Provides:	group(amavis)
 Provides:	user(amavis)
-Obsoletes:	amavisd
-Obsoletes:	amavis
 Obsoletes:	AMaViS
+Obsoletes:	amavis
+Obsoletes:	amavisd
+Conflicts:	logrotate < 3.7.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # optionally used
-%define	_noautoreq	'perl(Archive::Tar)' 'perl(Archive::Zip)' 'perl(Compress::Zlib)' 'perl(Convert::TNEF)' 'perl(Convert::UUlib)' 'perl(MIME::Parser)' 'perl(File::Scan)'
+%define	_noautoreq	'perl(File::Scan)'
 
 %description
 AMaViS-ng is a modular rewrite of amavisd and amavis-perl. It scans
@@ -44,13 +48,13 @@ of several third-party virus scanners and integrates nicely into
 several MTA setups. Unlike amavis-perl and amavisd, there is no need
 for build-time configuration.
 
-%description -l pl
-AMaViS-ng to przepisana w sposób modularny wersja projektów amavisd i
-amavis-perl. Skanuje pocztê elektroniczn± na okoliczno¶æ gro¼nego kodu
-wewn±trz za³±czników i archiwów, nie pozwalaj±c na dorêczenie w
-przypadku wykrycia. Wspiera integracjê ró¿nych zewnêtrznych skanerów
-antywirusowych, ³adnie integruje siê z ró¿nymi serwerami pocztowymi.
-W przeciwieñstwie do amavis-perl i amavisd, nie wymaga konfiguracji w
+%description -l pl.UTF-8
+AMaViS-ng to przepisana w sposób modularny wersja projektów amavisd i
+amavis-perl. Skanuje pocztę elektroniczną na okoliczność groźnego kodu
+wewnątrz załączników i archiwów, nie pozwalając na doręczenie w
+przypadku wykrycia. Wspiera integrację różnych zewnętrznych skanerów
+antywirusowych, ładnie integruje się z różnymi serwerami pocztowymi. W
+przeciwieństwie do amavis-perl i amavisd, nie wymaga konfiguracji w
 czasie budowania.
 
 %prep
@@ -59,6 +63,10 @@ czasie budowania.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+
+# precompiled x86 binary
+rm -f amavis-milter/amavis-milter
 
 %build
 %{__perl} Makefile.PL \
@@ -69,13 +77,15 @@ cd doc
 %{__make}
 
 cd ../amavis-milter
-%{__make}
+%{__make} \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/logrotate.d,%{_infodir},%{_sbindir}}
 install -d $RPM_BUILD_ROOT/var/spool/amavis-ng/{problems,quarantine,queue,tmp}
-install -d $RPM_BUILD_ROOT/var/{run/amavis-ng,log/{archiv/amavis-ng,amavis-ng}}
+install -d $RPM_BUILD_ROOT/var/{run/amavis-ng,log/{archive/amavis-ng,amavis-ng}}
 install -d $RPM_BUILD_ROOT%{_datadir}/amavis-ng
 
 %{__make} install \
@@ -92,33 +102,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 if [ "$1" = "1" ]; then
-    echo
-    echo type \"info amavis-ng\" to get help
-    echo
+	echo
+	echo 'Type "info amavis-ng" to get help'
+	echo
 fi
 
-if [ -n "`getgid amavis`" ]; then
-	if [ "`getgid amavis`" != "97" ]; then
-		echo "Warning: group amavis doesn't have gid=97. Correct this before installing amavis" 1>&2
-		exit 1
-	fi
-else
-	echo "adding group amavis GID=97"
-	/usr/sbin/groupadd -g 97 -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
-	echo "adding user amavis UID=97"
-	/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 97 -r -f amavis
+%useradd -u 97 -r -d /var/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody amavis
 
 %triggerin -- courier
 chown -R daemon /var/{spool,log}/amavis-ng
+if [ -f /var/lock/subsys/courier ]; then
+	%{_sbindir}/filterctl stop perlfilter
+	%{_sbindir}/filterctl start perlfilter
+fi
 
 %postun
 if [ "$1" = "0" ]; then
@@ -128,17 +125,17 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/old/README* doc/ChangeLog doc/RELEASE-NOTES
+%doc doc/README* doc/ChangeLog doc/RELEASE-NOTES
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(770,amavis,amavis) /var/log/amavis-ng
-%attr(770,amavis,amavis) /var/log/archiv/amavis-ng
+%attr(770,amavis,amavis) /var/log/archive/amavis-ng
 %attr(750,amavis,amavis) /var/run/amavis-ng
 %attr(770,amavis,amavis) /var/spool/amavis-ng
-%attr(644,amavis,amavis) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/amavis.conf
+%attr(644,amavis,amavis) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/amavis.conf
 %{_datadir}/amavis-ng
 %{_infodir}/amavis-ng.info*
 %{perl_vendorlib}/AMAVIS.pm
 %{perl_vendorlib}/AMAVIS
 %{_mandir}/man1/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/logrotate.d/amavis-ng
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/amavis-ng