--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2015/09/23 20:25:41	1.5
+++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2018/10/29 11:23:10	1.10
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
-%define version 1.1.2
-%define release 5
+%define version 1.2
+%define release 3
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -12,11 +12,12 @@ Source: %{name}-%{version}.tar.gz
 Packager: Doug Kruhm <dakruhm@daknetworks.net>
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: perl-Geo-IP
+Requires: perl-GeoIP2
+Requires: GeoIP >= 1.6.5
 BuildRequires: e-smith-devtools >= 1.13.1-03
-Patch0 : smeserver-geoip-remove-createlink-add-geoip-download-actions.patch
-Patch1: smeserver-geoip-1.1.2.geoip-update-event.patch
-Patch2: smeserver-geoip-whitelist_by_IP.patch
+Patch0: smeserver-geoip-conf-typo.patch
+Patch1: smeserver-geoip-fix-city-createlinks.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.
 
@@ -24,7 +25,23 @@ CHANGE THE CONFIG DB: config setprop qps
 SIGNAL EVENT: signal-event email-update
 
 %changelog
-%changelog
+* Mon Oct 29 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-3.sme
+- Fix Use of uninitialized value $city in string eq
+- Fix createlinks geoip-update action
+
+* Sat Jun 23 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-2.sme
+- Fix typo in createlinks
+
+* Tue Jun 12 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-1.sme
+- Update to latest v2 DBs [SME: 9033]
+- add geocity.pl and geocountry.pl test files
+
+* Wed Feb 15 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.2-7.sme
+- update requirement for GeoIP 1.6.5 [SME: 9714]
+
+* Thu Dec 22 2016 John Crisp <jcrisp@safeandsoundit.co.uk> 1.1.2-6
+- Use newer versions of GeoIP databases [SME: 9714]
+
 * Wed Sep 23 2015 John Crisp <jcrisp@safeandsoundit.co.uk> 1.1.2-5
 - Add ability to whitelist an IP [SME:8981]
 
@@ -62,7 +79,6 @@ SIGNAL EVENT: signal-event email-update
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__mkdir_p} root/var/lib/GeoIP