--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2020/01/22 02:09:12	1.20
+++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2020/01/22 12:32:48	1.21
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
 %define version 1.2
-%define release 13
+%define release 14
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -21,6 +21,7 @@ Patch3: smeserver-geoip-1.2-check_badcou
 Patch4: smeserver-geoip-1.2-bz10820-geoipv1-blockvountries-qpsmtpd.patch
 Patch5: smeserver-geoip-1.2-bz10815-display-country.patch
 Patch6: smeserver-geoip-1.2-bz10859-bz10740.patch
+Patch7: smeserver-geoip-1.2-fix-product-id.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.
@@ -65,6 +66,10 @@ SIGNAL EVENT: signal-event email-update
 #----------------------------------------------------
 
 %changelog
+* Wed Jan 22 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-14.sme
+- Change template from EditionID to ProductID
+- fix 20databasestore has a trailing tilde
+
 * Tue Jan 21 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-13.sme
 - add support for mmdblookup  [SME: 10740]
 - add support for download with AccountID and LicenseKey [SME: 10859]
@@ -153,6 +158,7 @@ SIGNAL EVENT: signal-event email-update
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__mkdir_p} root/var/lib/GeoIP