--- rpms/smeserver-fetchmail/contribs9/smeserver-fetchmail.spec	2017/12/02 06:04:06	1.8
+++ rpms/smeserver-fetchmail/contribs9/smeserver-fetchmail.spec	2018/12/14 11:20:11	1.11
@@ -1,4 +1,4 @@
-# $Id: smeserver-fetchmail.spec,v 1.7 2017/05/26 18:57:41 unnilennium Exp $
+# $Id: smeserver-fetchmail.spec,v 1.10 2018/03/11 06:17:20 jpp Exp $
 # Authority: unnilennium
 # Name: Jean-Philippe Pialasse 
 
@@ -6,7 +6,7 @@ Summary: sme module to generate fetchmai
 %define name smeserver-fetchmail
 Name: %{name}
 %define version 1.6
-%define release 10
+%define release 14
 %define smepanel FetchMails
 Version: %{version}
 Release: %{release}%{?dist}
@@ -18,21 +18,32 @@ Patch1: smeserver-fetchmail-1.6-update_i
 Patch2: smeserver-fetchmail-1.6-update_event_handling.patch
 Patch3: smeserver-fetchmail-1.6-add_sslfingerprint.patch
 Patch4: smeserver-fetchmail-1.6-locale-2017-12-02.patch
+Patch5: smeserver-fetchmail-1.6-bz10538-force_spamcheck.patch
+Patch6: smeserver-fetchmail-1.6-locale-2018-12-14.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: smeserver-release >= 9.0
 Requires: e-smith-email >= 4.16.0-18
 Requires: e-smith-formmagick >= 1.4.0-12
+# for spamcheck on SME9; on SME10 0.96-19 and 2.6.0-32
+Requires: qpsmtpd >= 0.96-11
+Requires: smeserver-qpsmtpd >= 2.4.0-39
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: sme-fetchmail
 Obsoletes: smeserver-fetchmail-utf8
 AutoReqProv: no
 
 %changelog
-* sam. déc. 02 2017 SME Translation Server <translations@contribs.org> 1.6-10.sme
+* Fri Dec 14 2018 John Crisp <jcrsip@safeandsoundit.co.uk> 1.6.14.sme
+- apply locale 2018-12-14 patch
+
+* Sun Mar 11 2018 Jean-Philipe Pialasse <tests@pialasse.com> 1.6-13.sme
+- fix no spamcheck anymore for fetchmail [SME: 10290]
+
+* Sat Dec 02 2017 SME Translation Server <translations@contribs.org> 1.6-12.sme
 - apply locale 2017-12-02 patch
 
-* Fri May 26 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.6-10.sme
+* Fri May 26 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.6-11.sme
 - added option field for sslfingerprint compatibility [SME: 8287]
 
 * Wed Jan 13 2016 Daniel Berteaud <daniel@firewall-services.com> 1.6-10.sme
@@ -80,6 +91,8 @@ sme server enhancement to make fetchmail
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks