--- rpms/smeserver-smeadmin/contribs10/smeserver-smeadmin.spec	2020/10/28 19:01:24	1.2
+++ rpms/smeserver-smeadmin/contribs10/smeserver-smeadmin.spec	2021/09/08 05:40:07	1.6
@@ -7,12 +7,15 @@ Summary: A graphical monitor, alert rais
 %define name smeserver-smeadmin
 Name: %{name}
 %define version 1.6
-%define release 1
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch0: smeserver-smeadmin-1.6-bz11062-initial-import.patch
+Patch1: smeserver-smeadmin-1.6-locale-2021-08-24.patch
+Patch2: smeserver-smeadmin-1.6-locale-2021-09-08.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -32,6 +35,23 @@ Requires: lm_sensors
 AutoReqProv: no
 
 %changelog
+* Wed Sep 08 2021 Terry Fage <terry.fage@gmail.com> 1.6-4.sme
+- apply locale 2021-09-08 patch
+
+* Tue Aug 24 2021 Terry Fage <terry.fage@gmail.com> 1.6-3.sme
+- apply locale 2021-08-24 patch
+
+* Thu Mar 25 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.6-2.sme
+- fix mysql not migrating sme9admind  [SME: 11062]
+- fix config db sme9admind not migrated to smeadmind
+- fix /var/lib/sme9admin not migrated
+- add smeserver-smeadmin-update event
+- fix services diplayed multiple times [SME: 11455]
+- systemd unit
+- review new logs locations
+- check calls to sysvinit
+- TODO implement new VPNs stats
+
 * Thu Oct 15 2020 Brian Read <brianr@bjsystems.co.uk> 1.6-1
 - Move to SME10, rename to smeadmin [SME: 11040, 11062]
 
@@ -150,6 +170,9 @@ This contrib is a bit inspired by e-smit
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -168,9 +191,9 @@ 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 \
-|grep -v '/etc/e-smith/sql/init/smeadmin'\
-|grep -v '/usr/bin/smeadmind'\
-|grep -v '/usr/share/doc/smeserver-smeadmin/add_ds_to_rrd.pl'> %{name}-%{version}-filelist
+--file /usr/bin/smeadmind 'attr(755,root,root)' \
+--file /usr/share/doc/smeserver-smeadmin/add_ds_to_rrd.pl 'attr(755,root,root)' \
+ > %{name}-%{version}-filelist
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -179,13 +202,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 
-
 %post
 
 %postun
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-%attr(755,root,root) /etc/e-smith/sql/init/smeadmin
-%attr(755,root,root) /usr/bin/smeadmind
-%attr(755,root,root) /usr/share/doc/smeserver-smeadmin/add_ds_to_rrd.pl