--- rpms/spamassassin/sme10/spamassassin.spec	2020/11/27 15:26:34	1.3
+++ rpms/spamassassin/sme10/spamassassin.spec	2024/04/02 10:31:42	1.11
@@ -58,14 +58,14 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
-Version: 3.4.4
+Version: 4.0.1
 #Release: 0.8.%%{prerev}%%{?dist}
-Release: 7%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 URL: https://spamassassin.apache.org/
 Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2
 #Source0: %%{real_name}-%%{version}-%%{prerev}.tar.bz2
-Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1873061.tgz
+Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1916528.tgz
 #Source1: %%{real_name}-rules-%%{version}.%%{prerev}.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
@@ -88,8 +88,10 @@ Source17: sa-update.timer
 # Patches 0-99 are RH specific
 # https://bugzilla.redhat.com/show_bug.cgi?id=1055593
 # Switch to using gnupg2 instead of gnupg1
-Patch0: spamassassin-3.3.2-gnupg2.patch
-Patch1: spamassassin-3.4.1-add-logfile-homedir-options.patch
+
+Patch0: spamassassin-4.0.1-gnupg2.patch
+Patch1: spamassassin-4.0.1-add-logfile-homedir-options.patch
+
 # Patches 100+ are SVN backports (DO NOT REUSE!)
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -100,7 +102,7 @@ Requires(post): diffutils
 
 BuildRequires: gcc
 BuildRequires: perl-interpreter >= 2:5.8.0
-BuildRequires: perl-generators
+BuildRequires: perl-generators-epel
 BuildRequires: perl(Net::DNS)
 BuildRequires: perl(Time::HiRes)
 BuildRequires: perl(HTML::Parser)
@@ -113,6 +115,10 @@ BuildRequires: perl(Net::CIDR::Lite)
 BuildRequires: perl(LWP::UserAgent)
 BuildRequires: perl(Digest::SHA1)
 BuildRequires: perl(Test::More)
+## added to build on Koozali SME Server builders
+BuildRequires: perl(ExtUtils::MakeMaker) 
+BuildRequires: perl-ExtUtils-Manifest  perl-Net-LibIDN2 perl-Net-LibIDN perl-DBI perl-DBD-SQLite perl-Net-DNS-Nameserver perl-Net-Patricia perl-Archive-Zip perl-IO-String perl-Email-Address perl-Email-Address-XS perl-Mail-DMARC wget   perl-MaxMind-DB-Reader-XS perl-MaxMind-DB-Reader perl-Geo-IP perl-IP-Country-DB_File perl-IP-Country
+# need to check if any deps are also needed at install in the list above
 # Fedora package needs fixing before we can depend on it
 #BuildRequires: re2c
 %if %{use_systemd}
@@ -206,9 +212,12 @@ To filter spam for all users, add that l
 
 %prep
 %setup -q -n Mail-SpamAssassin-%{version}
+
 # Patches 0-99 are RH specific
+
 %patch0 -p1
 %patch1 -p1
+
 # Patches 100+ are SVN backports (DO NOT REUSE!)
 # end of patches
 
@@ -389,6 +398,34 @@ exit 0
 %endif
 
 %changelog
+* Mon Apr 01 2024 Brian Read  <brianr@koozali.org> 4.0.1-3
+- Fix patch file [SME: 12574]
+
+* Mon Apr 01 2024 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.1-2
+- Fix the incorrect rules url
+
+* Mon Apr 01 2024 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.1-1
+- Update to 4.0.1 [SME: 12574]
+
+* Mon Mar 27 2023 JP Pialasse <tests@pialasse.com> 4.0.0-2
+- resolve build deps
+
+* Mon Feb 13 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 4.0.0-1
+- Update to 4.0.0 [SME: 12331]
+
+* Tue Dec 07 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.4.6-1.sme
+- Update to 3.4.6 [SME: 11798]
+- https://svn.apache.org/repos/asf/spamassassin/branches/3.4/build/announcements/3.4.6.txt
+
+* Sat Mar 27 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.4.5-1.sme
+- Update to 3.4.5 [SME: 11496]
+- https://svn.apache.org/repos/asf/spamassassin/branches/3.4/build/announcements/3.4.5.txt
+
+* Fri Nov 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.4.4-8.sme
+- import in SME Server 10 [SME: 11206]
+-  I just added BuildRequires for perl(ExtUtils::MakeMaker)
+-  all credit to John Crisp sweat on this one !
+
 * Thu Nov 26 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.4.4-7.sme
 - First import to SME v10