--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2015/09/22 21:41:35	1.3
+++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2018/06/19 13:20:57	1.8
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
-%define version 1.1.2
-%define release 3
+%define version 1.2
+%define release 1
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -12,10 +12,11 @@ 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.Remove_GEOIP_Download_Action.patch
+#Patch0: smeserver-geoip-remove-createlink-add-geoip-download-actions.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.
 
@@ -23,9 +24,22 @@ CHANGE THE CONFIG DB: config setprop qps
 SIGNAL EVENT: signal-event email-update
 
 %changelog
-* Tue Sep 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1.2-3
-- the action to download the geoip database is removed
-- added smeserver-geoip-1.1.2.Remove_GEOIP_Download_Action.patch
+* 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]
+
+* Tue Sep 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1.2-4
+- the event geoip-update download the geoip database 
+- added smeserver-geoip-1.1.2.geoip-update-event.patch 
 
 * Sun Jun 14 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1.2-2
 - added createlinks
@@ -55,8 +69,7 @@ SIGNAL EVENT: signal-event email-update
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
 
 %build
 %{__mkdir_p} root/var/lib/GeoIP
@@ -72,9 +85,6 @@ rm -f %{name}-%{version}-filelist
 rm -rf $RPM_BUILD_ROOT
 
 %post
-#download the first time the geoip database
-wget -O /var/lib/GeoIP/GeoIP.dat.gz http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz 2>&1 1>/dev/null
-gunzip -f /var/lib/GeoIP/GeoIP.dat.gz 2>&1 1>/dev/null
 
 %postun