--- rpms/smeserver-geoip/contribs10/smeserver-geoip.spec	2021/03/14 04:34:15	1.4
+++ rpms/smeserver-geoip/contribs10/smeserver-geoip.spec	2021/03/14 04:49:45	1.5
@@ -15,6 +15,7 @@ BuildArchitectures: noarch
 Requires: perl-GeoIP2
 Requires: libmaxminddb >= 1.1.1
 Requires: libmaxminddb-devel >= 1.1.1
+Requires: geoipupdate
 Requires: geolite2-country
 Requires: geolite2-city
 Provides: smeserver-geoip2 >= 1.2-16
@@ -27,6 +28,7 @@ Patch4: smeserver-geoip-1.2-bz10820-geoi
 Patch5: smeserver-geoip-1.2-bz10815-display-country.patch
 Patch6: smeserver-geoip-1.2-bz10859-bz10740.patch
 Patch7: smeserver-geoip-1.2-fix-product-id.patch
+Patch8: smeserver-geoip-1.2-sme10-update.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.
@@ -56,6 +58,7 @@ The GEOIP plugin lets us know which coun
 - rebuild for SME10 [SME: 11023]
   make geoip2 default
   create geoip-legacy package with old geoip1 stuffs
+  smeserver-geoip(-legacy)-update events
 
 * Tue Oct 06 2020 Brian Read <brianr@bjsystems.co.uk> 1.2-15.sme
 - Import to SME10 tree [SME: 11023]
@@ -154,6 +157,8 @@ The GEOIP plugin lets us know which coun
 %patch6 -p1
 %patch7 -p1
 rm -rf root/var/
+%patch8 -p1
+mkdir -p root/etc/e-smith/events/smeserver-geoip-legacy
 
 %build
 perl createlinks
@@ -165,18 +170,13 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 
 cat %{name}-%{version}-filelist \
-> %{name}-%{version}-filelist
-#|grep -v 'etc/e-smith/templates/etc/GeoIP.conf' \
-#|grep -v 'usr/bin/geocity.pl' \
-#|grep -v 'usr/bin/geocountry.pl'\
-#|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' \
-#|grep -v '/etc/e-smith/db/configuration/defaults/geoip' \
-# > %{name}-%{version}-filelist-v1
+|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
+
 #diff -u %{name}-%{version}-filelist %{name}-%{version}-filelist-v1 | grep -E "^\-"| sed -E 's/^\-//'|grep -v filelist > %{name}-%{version}-filelist-v2
-touch %{name}-%{version}-filelist-legacy
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -185,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun
 
-%files -f %{name}-%{version}-filelist
+%files -f %{name}-%{version}-filelist-base
 %defattr(-,root,root)