--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2019/01/05 19:53:29	1.12
+++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2019/01/16 12:35:12	1.14
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
 %define version 1.2
-%define release 5
+%define release 7
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -17,6 +17,7 @@ BuildRequires: e-smith-devtools >= 1.13.
 Patch0: smeserver-geoip-conf-typo.patch
 Patch1: smeserver-geoip-fix-city-createlinks.patch
 Patch2: smeserver-geoip-1.2-check_badcountries.patch
+Patch3: smeserver-geoip-1.2-check_badcountries-mailstats.patch
 
 %description
 The GEOIP plugin lets us know which country our mail server is receiving mail from. If we're receiving too much spam from a particular country, this will help track it down and then use that info to reject connections from that country. This ends up taking the load off our servers.
@@ -56,6 +57,12 @@ SIGNAL EVENT: signal-event email-update
 #----------------------------------------------------
 
 %changelog
+* Tue Jan 15 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-7.sme
+- Update check_badcountries to work with mailstats
+
+* Sat Jan 05 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-6.sme
+- remove crontab fragment for v1 [SME: 10691]
+
 * Sat Jan 05 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-5.sme
 - fix wrong loglevel LOGINFO instead of LOGNOTICE needed [SME: 10679]
 - try first db v2 and back on v1 if not available [SME: 10691]
@@ -120,6 +127,7 @@ SIGNAL EVENT: signal-event email-update
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__mkdir_p} root/var/lib/GeoIP
@@ -137,6 +145,7 @@ cat %{name}-%{version}-filelist \
 |grep -v 'usr/bin/geocountry.pl'\
 |grep -v 'smeserver-geopip-download-action' \
 |grep -v 'templates2expand/etc/GeoIP.conf' \
+|grep -v '/etc/crontab/91_Update_Geoip_db' \
  > %{name}-%{version}-filelist-v1
 
 %clean