--- rpms/spamassassin/sme9/spamassassin.spec	2015/07/10 06:20:56	1.4
+++ rpms/spamassassin/sme9/spamassassin.spec	2020/11/25 15:24:27	1.12
@@ -1,14 +1,14 @@
 %define pkgname Mail-SpamAssassin
 
 Name: spamassassin
-Version: 3.3.2
-Release: 59%{?dist}
+Version: 3.4.4
+Release: 1%{?dist}
 Summary: Spam filter for email which can be invoked from mail delivery agents
 License: Apache
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{version}.tar.bz2
-Source1: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{version}-r1104058.tar.gz
+Source1: http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{version}.r1873061.tgz
 Source2: redhat_local3.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -25,12 +25,9 @@ Source50: http://www.apache.org/dist/spa
 #Source60: http://yerp.org/rules/GPG.KEY
 Source60: GPG-sought.KEY
 Patch0: Mail-SpamAssassin-3.0.0-krb5.patch
-#Patch1: sa-1027163-for-3.3.diff
-Patch1000: Mail-SpamAssassin-3.3.2-update_RegistrarBoundaries.patch
 Buildroot: %{_tmppath}/%{name}-root
 Requires(pre): /sbin/chkconfig /sbin/service
 
-BuildRequires: atrpms-rpm-config
 BuildRequires: openssl-devel, krb5-devel
 BuildRequires: autoconf
 BuildRequires: perl >= 2:5.8.1
@@ -43,7 +40,7 @@ BuildRequires: perl(HTML::Parser) >= 3.4
 BuildRequires: perl(Archive::Tar) >= 1.23
 BuildRequires: perl(Mail::DKIM) >= 0.37
 BuildRequires: perl(Net::DNS) >= 0.58
-BuildRequires: perl(NetAddr::IP)
+BuildRequires: perl(NetAddr::IP) >= 4.010
 BuildRequires: perl(Sys::Hostname)
 BuildRequires: perl(Time::HiRes)
 BuildRequires: perl(Time::Local)
@@ -73,6 +70,9 @@ BuildRequires: mod_perl
 BuildRequires: %{_bindir}/dccproc
 BuildRequires: %{_bindir}/pyzor
 
+##JPP
+BuildRequires: perl(Net::DNS::Nameserver)
+
 ###
 Requires: perl(Digest::SHA)
 Requires: perl(File::Spec) >= 0.8
@@ -139,21 +139,25 @@ To filter spam for all users, add that l
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1 -b .krb5
-#patch1 -p0 -b .goto
-%patch1000 -p1
 
 %build
 (cd spamc; autoconf)
 %define _perl_buildroot %{nil}
-%perl_configure ENABLE_SSL=yes
-%perl_make
-%perl_makecheck || :
+test -z "$PERL5LIB" && export PERL5LIB=%{buildroot}%{perl_vendorarch}:%{buildroot}%{perl_vendorlib} || \
+  export PERL5LIB="$PERL5LIB":%{buildroot}%{perl_vendorarch}:%{buildroot}%{perl_vendorlib}
+test -z "$CFLAGS" && export CFLAGS="%{optflags}"
+%{__perl} Makefile.PL 'PREFIX=%{_perl_buildroot}%{_prefix}' INSTALLDIRS=vendor ENABLE_SSL=yes
+%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%if %{?_without_check:0}%{!?_without_check:1}
+%{__make} test || :
 %endif
 mv spamd/README spamd/README.spamd
 
 %install
 rm -rf %{buildroot}
-%perl_makeinstall DESTDIR=%{buildroot}
+%{__make} install DESTDIR_REDIRECT=%{buildroot} DESTDIR=%{buildroot}
+find %{buildroot} \( -name .packlist -or -name perllocal.pod -or \( -name '*.bs' -a -empty \) \) -exec rm -f {} \;
 install -d %{buildroot}/%{_initrddir}
 install -p -m 0755 spamd/redhat-rc-script.sh %{buildroot}/%{_initrddir}/spamassassin
 
@@ -183,7 +187,7 @@ popd
 
 install -p -m 0644 %{SOURCE20} %{buildroot}%{_datadir}/spamassassin/99_bogus-virus-warnings.cf
 
-install -p -m 0644 %{SOURCE60} %{buildroot}%{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
+#install -p -m 0644 %{SOURCE60} %{buildroot}%{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
 install -p -m 0644 %{SOURCE50} %{buildroot}%{_datadir}/spamassassin/release-spamassassin.org-key.txt
 install -p -m 0644 %{SOURCE40} %{buildroot}%{_datadir}/spamassassin/updates.spamassassin.org-key.txt
 #install -p -m 0644 %{SOURCE30} %{buildroot}%{_datadir}/spamassassin/saupdates.openprotect.com-key.txt
@@ -197,8 +201,8 @@ mkdir -p %{buildroot}/var/lib/spamassass
 
 %{perl_vendorlib}/Mail/SpamAssassin.pm
 %{perl_vendorlib}/Mail/SpamAssassin
-%{perl_man3dir}/Mail::SpamAssassin*.3pm*
-%{perl_man1dir}/sa-awl.1*
+%{_mandir}/man3/Mail::SpamAssassin*.3pm*
+%{_mandir}/man1/sa-awl.1*
 %{perl_vendorlib}/spamassassin-run.pod
 %{_datadir}/spamassassin
 
@@ -242,7 +246,7 @@ done
 sa-update --import %{_datadir}/spamassassin/release-spamassassin.org-key.txt
 sa-update --import %{_datadir}/spamassassin/updates.spamassassin.org-key.txt
 #sa-update --import %{_datadir}/spamassassin/saupdates.openprotect.com-key.txt
-sa-update --import %{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
+#sa-update --import %{_datadir}/spamassassin/sought.rules.yerp.org-key.txt
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -257,6 +261,22 @@ fi
 exit 0
 
 %changelog
+* Mon Jan 07 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 3.4.2-2.sme
+- Obsolete sought.rules.yerp.org references [SME:10597]
+- Comment out sought.rules.yerp.org in channels
+
+* Wed Dec 12 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 3.4.2-1.sme
+- update to 3.4.2 [SME: 10597]
+
+* Tue Jun 19 2018 Jean-Philipe Pialasse <tests@pialasse.com> 3.4.1-2.sme
+- add build require perl(Net::DNS::Nameserver)  and import dependencies [SME: 10597]
+
+* Wed Jan 6 2016 Daniel Berteaud <daniel@firewall-services.com> - 3.4.1-1.sme
+- Update to 3.4.1 [SME: 9153]
+
+* Fri Jul 10 2015 Daniel Berteaud <daniel@firewall-services.com> - 3.3.2-60.sme
+- Expand atrpms macro and remove BuildReq on atrpms-rpm-config [SME: 8980]
+
 * Fri Jul 10 2015 Daniel Berteaud <daniel@firewall-services.com> - 3.3.2-59.sme
 - Add atrpms-rpm-config to the BUildReq so it can build [SME: 8980]