--- rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2019/01/16 12:35:12	1.14
+++ rpms/smeserver-geoip/contribs9/smeserver-geoip.spec	2019/01/25 02:57:46	1.15
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
 %define version 1.2
-%define release 7
+%define release 8
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -44,6 +44,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 +58,10 @@ SIGNAL EVENT: signal-event email-update
 #----------------------------------------------------
 
 %changelog
+* 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
 
@@ -147,6 +152,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 +166,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