--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2019/01/16 12:35:12	1.14
+++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2019/10/18 22:13:31	1.16
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
 %define version 1.2
-%define release 7
+%define release 9
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -18,6 +18,7 @@ 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
+Patch4: smeserver-geoip-1.2-bz10820-geoipv1-blockvountries-qpsmtpd.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.
@@ -44,6 +45,7 @@ SIGNAL EVENT: signal-event email-update
 %package        -n smeserver-geoip2
 Summary:        SME Server geoip plugin v2
 Group:          Email
+Requires: 	smeserver-geoip
 Requires: 	perl-GeoIP2
 Requires: 	GeoIP >= 1.6.5
 BuildRequires: 	e-smith-devtools >= 1.13.1-03
@@ -57,6 +59,13 @@ SIGNAL EVENT: signal-event email-update
 #----------------------------------------------------
 
 %changelog
+* Fri Oct 18 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-9.sme
+- revert blocking country for geoipv1 qpsmtpd plugin [SME: 10820]
+
+* Thu Jan 24 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-8.sme
+- make smeserver-geoip2 requires smeserver-geoip  [SME: 10691]
+  this will avoid having both packages sharing few files.
+
 * Tue Jan 15 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2-7.sme
 - Update check_badcountries to work with mailstats
 
@@ -128,6 +137,7 @@ SIGNAL EVENT: signal-event email-update
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__mkdir_p} root/var/lib/GeoIP
@@ -147,6 +157,7 @@ cat %{name}-%{version}-filelist \
 |grep -v 'templates2expand/etc/GeoIP.conf' \
 |grep -v '/etc/crontab/91_Update_Geoip_db' \
  > %{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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -160,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
-%files -n smeserver-geoip2 -f %{name}-%{version}-filelist
+%files -n smeserver-geoip2 -f %{name}-%{version}-filelist-v2
 %defattr(-,root,root,-)
 
 %files -n smeserver-geoip1 -f %{name}-%{version}-filelist-v1