--- rpms/smeserver-geoip/contribs10/smeserver-geoip.spec	2021/03/14 05:57:01	1.6
+++ rpms/smeserver-geoip/contribs10/smeserver-geoip.spec	2021/03/14 18:40:50	1.7
@@ -1,6 +1,6 @@
 %define name smeserver-geoip
 %define version 1.2
-%define release 16
+%define release 17
 
 Summary: SME Server geoip plugin
 Name: %{name}
@@ -18,7 +18,14 @@ Requires: libmaxminddb-devel >= 1.1.1
 Requires: geoipupdate
 Requires: geolite2-country
 Requires: geolite2-city
-Provides: smeserver-geoip2 >= 1.2-16
+# for legacy
+Requires: perl-Geo-IP
+Requires: GeoIP >= 1.6.5
+Requires: GeoIP-GeoLite-data
+Requires: GeoIP-GeoLite-data-extra
+#
+Provides: smeserver-geoip2 = %{version}-%{release}
+PRovides: smeserver-geoip-legacy = %{version}-%{release}
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Patch0: smeserver-geoip-conf-typo.patch
 Patch1: smeserver-geoip-fix-city-createlinks.patch
@@ -37,23 +44,25 @@ CHANGE THE CONFIG DB: config setprop qps
 SIGNAL EVENT: signal-event email-update
 
 #----------------------------------------------------
-
-%package        -n smeserver-geoip-legacy
-Summary:        SME Server geoip plugin v1
-Group:          Email
-Requires: 	perl-Geo-IP
-Requires: 	GeoIP >= 1.6.5
-Requires:	GeoIP-GeoLite-data
-Requires:	GeoIP-GeoLite-data-extra
-Requires: 	smeserver-geoip >= 1.2-16
-BuildRequires: 	e-smith-devtools >= 1.13.1-03
-
-%description    -n smeserver-geoip-legacy
-Package to use the legacy plugin. DB are not updated since 2018
-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.
+#%package        -n smeserver-geoip-legacy
+#Summary:        SME Server geoip plugin v1
+#Group:          Email
+#Requires: 	perl-Geo-IP
+#Requires: 	GeoIP >= 1.6.5
+#Requires:	GeoIP-GeoLite-data
+#Requires:	GeoIP-GeoLite-data-extra
+#Requires: 	smeserver-geoip = %{version}-%{release}
+#BuildRequires: 	e-smith-devtools >= 1.13.1-03
+#%description    -n smeserver-geoip-legacy
+#Package to use the legacy plugin. DB are not updated since 2018
+#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.
 #----------------------------------------------------
 
 %changelog
+* Sun Mar 14 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.2-17.sme
+- merge legacy with main as we have few packages still using legacy [SME: 11023]
+  those are php*-pecl-geoip proftpd bind-libs* bind-utils.
+
 * Sat Mar 13 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-16.sme
 - rebuild for SME10 [SME: 11023]
   make geoip2 default
@@ -158,7 +167,8 @@ The GEOIP plugin lets us know which coun
 %patch7 -p1
 rm -rf root/var/
 %patch8 -p1
-mkdir -p root/etc/e-smith/events/smeserver-geoip-legacy
+# commented for legacy
+#mkdir -p root/etc/e-smith/events/smeserver-geoip-legacy
 
 %build
 perl createlinks
@@ -174,11 +184,10 @@ rm -f %{name}-%{version}-filelist
 cat %{name}-%{version}-filelist \
 |grep -v 'etc/e-smith/events/smeserver-geoip-legacy' \
 > %{name}-%{version}-filelist-base
-cat %{name}-%{version}-filelist \
-|grep 'etc/e-smith/events/smeserver-geoip-legacy' \
-> %{name}-%{version}-filelist-legacy
+#cat %{name}-%{version}-filelist \
+#|grep 'etc/e-smith/events/smeserver-geoip-legacy' \
+#> %{name}-%{version}-filelist-legacy
 
-#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
@@ -192,8 +201,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
-%files -n smeserver-geoip-legacy -f %{name}-%{version}-filelist-legacy
-%defattr(-,root,root,-)
+#%files -n smeserver-geoip-legacy -f %{name}-%{version}-filelist-legacy
+#%defattr(-,root,root,-)