--- rpms/smeserver-xt_geoip/contribs10/smeserver-xt_geoip.spec	2021/03/14 18:23:46	1.4
+++ rpms/smeserver-xt_geoip/contribs10/smeserver-xt_geoip.spec	2022/01/07 15:57:54	1.12
@@ -1,6 +1,6 @@
 %define name smeserver-xt_geoip
 %define version 1.3.1
-%define release 4
+%define release 12
 
 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel.
 Name: %{name}
@@ -13,6 +13,13 @@ Source: %{name}-%{version}.tar.xz
 Patch0: %{name}-%{version}-comp_e-smith-manager.patch
 Patch1: %{name}-%{version}-update_base.patch
 Patch2: smeserver-xt_geoip-1.3.1-update-event-oldManager.patch
+Patch3: %{name}-%{version}-logfiles_changes.patch
+Patch4: smeserver-xt_geoip-1.3.1-locale-2021-08-25.patch
+Patch5: smeserver-xt_geoip-1.3.1-locale-2021-09-23.patch
+Patch6: smeserver-xt_geoip-1.3.1-locale-2021-10-28.patch
+#Note this one is not applied!!
+Patch7: smeserver-xt_geoip-1.3.1-SME_11676.patch
+Patch8: smeserver-xt_geoip-1.3.1-Add-class-to-div-for-AdminLTE.patch
 
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
@@ -20,7 +27,7 @@ BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 10.0
 Requires: server-manager >= 0.1.0-23
 Requires: xtables-addons = 2.14
-Requires: GeoIP = 1.5.0
+Requires: GeoIP >= 1.5.0
 Requires: libmaxminddb >= 1.1.1
 Requires: libmaxminddb-devel >= 1.1.1
 Requires: geolite2-country
@@ -36,6 +43,20 @@ smserver rpm to setup database, update a
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch8 -p1
+
+# tmp fix before new source archive
+rm -rf root/etc/e-smith/events/bootstrap-console-save/templates2expand
+rm -rf root/etc/e-smith/events/console-save/templates2expand
+rm -rf root/etc/e-smith/events/xt_geoip-modify/templates2expand/usr
+rm -rf root/etc/e-smith/events/xt_geoip-update/templates2expand/usr
+
+%patch7 -p1
+
 
 %build
 perl createlinks
@@ -47,16 +68,16 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
- --file /usr/share/xt_geoip/geoip_countries_list.txt  '%attr(0755, root, root)'\
- --file /usr/share/xt_geoip/geoip_exstat  '%attr(0755, root, root)'\
- --file /usr/share/xt_geoip/geoip_listat '%attr(0755, root, root)'\
- --file /usr/share/xt_geoip/geoip_look  '%attr(0755, root, root)'\
- --file /usr/share/xt_geoip/geoip_stats '%attr(0755, root, root)'\
- --file /usr/share/xt_geoip/xt_geoip_dl '%attr(0750, root, root)'\
- --file /usr/share/xt_geoip/update_base '%attr(0750, root, root)'\
+ --file /usr/share/xt_geoip/geoip_countries_list.txt  'attr(0755, root, root)'\
+ --file /usr/share/xt_geoip/geoip_exstat  'attr(0755, root, root)'\
+ --file /usr/share/xt_geoip/geoip_listat 'attr(0755, root, root)'\
+ --file /usr/share/xt_geoip/geoip_look  'attr(0755, root, root)'\
+ --file /usr/share/xt_geoip/geoip_stats 'attr(0755, root, root)'\
+ --file /usr/share/xt_geoip/xt_geoip_dl 'attr(0750, root, root)'\
+ --file /usr/share/xt_geoip/update_base 'attr(0750, root, root)'\
     > %{name}-%{version}-filelist
 echo "%doc COPYING"  >> %{name}-%{version}-filelist
-cat %{name}-%{version}-filelist
+
 %clean
 cd ..
 rm -rf %{name}-%{version}
@@ -74,7 +95,30 @@ rm -rf %{name}-%{version}
 
 
 %changelog
-* Sat Mar 13 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.3.1-04.sme
+* Fri Jan 07 2022 Brian Read <brianr@bjsystems.co.uk> 1.3.1-12.sme
+- Add-class-to-div-for-AdminLTE [SME: 11839]
+
+* Fri Oct 29 2021 Michel Begue <mab974@misouk.com> 1.3.1-11.sme
+- fix multiple_rpm_owners [SME: 11676]
+- add event for smeserver-manager
+- delete expand-template for update_base
+
+* Thu Oct 28 2021 Michel Begue <mab974@gmail.com> 1.3.1-10.sme
+- apply locale 2021-10-28 patch
+
+* Fri Sep 24 2021 Terry Fage <tfage@yahoo.com.au> 1.3.1-09.sme
+- apply locale 2021-09-23 patch
+
+* Wed Aug 25 2021 Terry Fage <tfage@yahoo.com.au> 1.3.1-08.sme
+- apply locale 2021-08-25 patch
+
+* Tue Mar 16 2021 Michel Begue <mab974@gmail.com> 1.3.1-07.sme
+- Fix script as logfiles change (sshd - iptables)
+
+* Sun Mar 14 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.3.1-06.sme
+- change Geoip requirement to >= 1.5
+
+* Sat Mar 13 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.3.1-05.sme
 - readded changelog from contribs9
 - moved changelog to the end of spec
 - TODO review the two section of %files
@@ -177,4 +221,3 @@ rm -rf %{name}-%{version}
 * Tue Sep 12 2017 Michel Begue <mab974@gmail.com>
 - initial release
 - [1.0.0-1]
-