--- rpms/spamassassin/sme10/spamassassin.spec	2021/12/07 17:07:33	1.6
+++ rpms/spamassassin/sme10/spamassassin.spec	2023/03/07 14:27:53	1.7
@@ -58,14 +58,14 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
-Version: 3.4.6
+Version: 4.0.0
 #Release: 0.8.%%{prerev}%%{?dist}
 Release: 1%{?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}.r1888502.tgz
+Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1905950.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.0-gnupg2.patch
+Patch1: spamassassin-4.0.0-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)
@@ -208,9 +210,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
 
@@ -391,7 +396,10 @@ exit 0
 %endif
 
 %changelog
-* Tue Dec 07 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 
+* 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