X-Git-Url: https://git.tld-linux.org/?p=packages%2Fspamassassin.git;a=blobdiff_plain;f=spamassassin.spec;h=e91d45cb33880264b8e95fb9d8ff7bb4432f8dae;hp=b88367b51c1c8a2e3220a7d5353601a60f4f93a9;hb=HEAD;hpb=c1afbf53c3b26be67d5774306eda0be93ce514c1

diff --git a/spamassassin.spec b/spamassassin.spec
index b88367b..4407fbd 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -8,16 +8,15 @@
 %define		pdir	Mail
 %define		pnam	SpamAssassin
 %define		sa_version %(printf %d.%03d%03d $(echo %{version} | tr '.' ' '))
-%include	/usr/lib/rpm/macros.perl
 Summary:	A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):	Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:		spamassassin
-Version:	3.4.2
-Release:	2
+Version:	4.0.1
+Release:	1
 License:	Apache v2.0
 Group:		Applications/Mail
-Source0:	http://ftp.man.poznan.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
-# Source0-md5:	4f4c38a7cd4ae3e3750895ae21d2fc78
+Source0:	https://dlcdn.apache.org//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
+# Source0-md5:	b42eaf00f2f5a013813ae051ab2c63b6
 Source1:	%{name}.sysconfig
 Source2:	%{name}-spamd.init
 Source3:	%{name}-default.rc
@@ -25,9 +24,7 @@ Source4:	%{name}-spamc.rc
 Source5:	sa-update.sh
 Source6:	sa-update.cron
 Source7:	spamassassin-official.conf
-Source8:	sought.conf
-Patch0:		bug_771408_perl_version
-Patch1:		config-dir.patch
+Patch0:		config-dir.patch
 URL:		http://spamassassin.apache.org/
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.16
@@ -35,6 +32,7 @@ BuildRequires:	perl-Archive-Tar
 BuildRequires:	perl-DBI
 BuildRequires:	perl-DB_File
 BuildRequires:	perl-Digest-SHA1 >= 2.10
+BuildRequires:	perl-Geo-IP
 BuildRequires:	perl-HTML-Parser >= 3
 BuildRequires:	perl-IO-Socket-INET6 >= 2.51
 BuildRequires:	perl-IO-Socket-SSL
@@ -43,8 +41,13 @@ BuildRequires:	perl-IP-Country
 BuildRequires:	perl-Mail-SPF-Query
 BuildRequires:	perl-Net-DNS >= 0.65-3
 BuildRequires:	perl-Net-Ident
+BuildRequires:	perl-Net-LibIDN
+BuildRequires:	perl-Net-LibIDN2
+BuildRequires:	perl-Net-Patricia
 BuildRequires:	perl-NetAddr-IP >= 4.000
+BuildRequires:	perl-Perl-Critic-Policy-Perlsecret
 #BuildRequires:	perl-Razor2
+BuildRequires:	perl-Text-Diff
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	perl-libwww
 BuildRequires:	re2c
@@ -61,6 +64,7 @@ BuildRequires:	perl-Mail-DomainKeys
 BuildRequires:	perl-Mail-SPF
 BuildRequires:	perl-MailTools
 BuildRequires:	perl-Razor > 2.61
+BuildRequires:  tesseract-data-lang-en
 %endif
 Requires:	perl-Mail-SpamAssassin = %{version}-%{release}
 Obsoletes:	SpamAssassin
@@ -113,9 +117,9 @@ Requires(post,preun):	/sbin/chkconfig
 Requires:	perl-Mail-SpamAssassin = %{version}-%{release}
 Requires:	rc-scripts
 Suggests:	perl-Apache-Test
+Suggests:	perl-IO-Socket-INET6
 Suggests:	perl-IO-Socket-IP
 Suggests:	perl-IO-Socket-SSL
-Suggests:	perl-IO-Socket-INET6
 Suggests:	perl-Net-Ident
 
 %description spamd
@@ -175,9 +179,9 @@ Group:		Applications/Mail
 Requires:	gcc
 Requires:	glibc-devel
 Requires:	make
-Requires:	perl(ExtUtils::MakeMaker)
 Requires:	perl-Mail-SpamAssassin = %{version}-%{release}
 Requires:	perl-devel
+Requires:	perl-devel
 Requires:	re2c >= 0.10
 
 %description compile
@@ -263,17 +267,6 @@ aplikacji do czytania poczty.
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 %patch0 -p1
-%patch1 -p1
-
-# disable broken test
-%{__mv} t/sa_compile.t{,.disabled}
-
-# this test needs network, does not work on builders
-%{__mv} t/dnsbl_subtests.t{,.disabled}
-
-# temporary disable problematic tests
-%{__mv} t/trust_path.t{,.disabled}
-%{__mv} t/urilocalbl_geoip.t{,.disabled}
 
 %build
 # for spamc/configure
@@ -308,7 +301,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin
 install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/spamassassin/sa-update.cron
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/sa-update
 install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/channel.d
-install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/spamassassin/channel.d
 
 # sa-update, sa-compile
 install -d $RPM_BUILD_ROOT/var/lib/spamassassin/{%{sa_version},compiled/%{sa_version}}
@@ -364,7 +356,7 @@ fi
 [ -n "$(find /etc/mail/spamassassin -type d -empty 2>/dev/null)" ] && rmdir /etc/mail/spamassassin 2>/dev/null || :
 [ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
 
-%triggerpostun -n perl-Mail-SpamAssassin -- perl-Mail-SpamAssassin < 3.4.2
+%triggerpostun -n perl-Mail-SpamAssassin -- perl-Mail-SpamAssassin < 3.4.2-2
 echo
 echo "Warning! Configuration has been migrated to /etc/spamassassin."
 echo
@@ -390,6 +382,7 @@ fi
 
 # It's needed for help of spamassassin command.
 %{perl_vendorlib}/spamassassin-run.pod
+%{_mandir}/man1/sa-check_spamd.1*
 %{_mandir}/man1/sa-learn.1*
 %{_mandir}/man1/spamassassin.1*
 %{_mandir}/man1/spamassassin-run.1*
@@ -421,7 +414,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spamassassin/channels
 %dir %{_sysconfdir}/spamassassin/channel.d
 %{_sysconfdir}/spamassassin/channel.d/spamassassin-official.conf
-%{_sysconfdir}/spamassassin/channel.d/sought.conf
 %attr(700,root,root) %dir %{_sysconfdir}/spamassassin/sa-update-keys
 %attr(700,root,root) %ghost %{_sysconfdir}/spamassassin/sa-update-keys/*
 %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/sa-update