--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2019/10/21 01:48:39	1.17
+++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2020/01/21 20:13:18	1.18
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
 %define version 1.2
-%define release 10
+%define release 11
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -20,6 +20,7 @@ Patch2: smeserver-geoip-1.2-check_badcou
 Patch3: smeserver-geoip-1.2-check_badcountries-mailstats.patch
 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
 
 %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.
@@ -49,6 +50,10 @@ Group:          Email
 Requires: 	smeserver-geoip
 Requires: 	perl-GeoIP2
 Requires: 	GeoIP >= 1.6.5
+Requires: libmaxminddb >= 1.1.1
+Requires: libmaxminddb-devel >= 1.1.1
+Requires: geolite2-country
+Requires: geolite2-city
 BuildRequires: 	e-smith-devtools >= 1.13.1-03
 
 
@@ -60,6 +65,10 @@ SIGNAL EVENT: signal-event email-update
 #----------------------------------------------------
 
 %changelog
+* Tue Jan 21 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-11.sme
+- add support for mmdblookup  [SME: 10740]
+- add support for download with AccountID and LicenseKey [SME: 10859]
+
 * Sun Oct 20 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-10.sme
 - fix country not logged if no badcountries defined [SME: 10815]
 
@@ -143,6 +152,7 @@ SIGNAL EVENT: signal-event email-update
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__mkdir_p} root/var/lib/GeoIP
@@ -161,6 +171,7 @@ cat %{name}-%{version}-filelist \
 |grep -v 'smeserver-geopip-download-action' \
 |grep -v 'templates2expand/etc/GeoIP.conf' \
 |grep -v '/etc/crontab/91_Update_Geoip_db' \
+|grep -v '/usr/bin/geoiplook' \
  > %{name}-%{version}-filelist-v1
 diff -u %{name}-%{version}-filelist %{name}-%{version}-filelist-v1 | grep -E "^\-"| sed -E 's/^\-//'|grep -v filelist > %{name}-%{version}-filelist-v2