--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2020/12/08 20:01:25	1.19
+++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2021/03/13 14:35:58	1.24
@@ -1,10 +1,10 @@
-# $Id: e-smith-mysql.spec,v 1.18 2020/12/08 19:57:09 jpp Exp $
+# $Id: e-smith-mysql.spec,v 1.23 2021/03/04 20:17:44 jpp Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
 %define version 2.6.0
-%define release 15
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,6 +19,9 @@ Patch5: e-smith-mysql-2.6.0.bz9688.skipr
 Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch
 Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch
 Patch8: e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch
+Patch9: e-smith-mysql-2.6.0-bz7827-dumpfailure.patch
+Patch10: e-smith-mysql-2.6.0-bz455-bz4606-bz11404-bz11425.patch
+Patch11: e-smith-mysql-2.6.0.bz11453-sme9restoreerror.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -30,6 +33,28 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* Sat Mar 14 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-20.sme
+- fix restore of sme9 backup fails to start mysql.init [SME: 11453]
+
+* Thu Mar 04 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-19.sme
+- add property to enable  mysqld slow queries log [SME: 455]
+  simply use SlowQueries as the amount of second and it is enabled
+  remove property to stop logging
+- more mysqld/mariadb parameter available with properties /templates  [SME: 4606]
+- ease 4 databit characters with innodb [SME: 11404]
+- redirect mariadb log from systemd to file [SME: 11425]
+
+* Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+- fix backup fails in pre-backup in mysqldump [SME: 7827]
+
+* Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
+- expand 10mysql_upgrade and restart mysql.init on e-smith-mysql-update [SME: 11120]
+  this to make sure mariadb upgrade fully and prevent residual 10mysql_upgrade stay in the way
+
+* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
+- fix issue with 10mysql_upgrade crashing mariadb [SME: 11120]
+  also removed noise from spec file
+
 * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
 - e-smith-update event [SME: 11145]
 - mariadb systemd integration [SME: 11021]
@@ -785,7 +810,6 @@ rm -rf root/var/run/
 rm -rf root/var/log/mysqld
 rm -f root/etc/rc.d/init.d/supervise/mysqld
 rm -f root/etc/rc.d/rc7.d/S50mysqld
-
 mkdir -p root/var/log/mariadb.run
 %patch6 -p1
 # move mariadb to systemd
@@ -796,10 +820,12 @@ rm -rf root/var/service
 rm -rf root/service
 rm -rf root/etc/rc.d/init.d/supervise
 rm -rf root/var/log
-
 # move mysql.init
 %patch8 -p1
 rm -rf root/etc/rc.d/rc7.d
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks
@@ -809,12 +835,6 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \
-    --file /var/service/mariadb/run 'attr(0755,root,root)' \
-    --file /var/service/mariadb/control/t 'attr(0750,root,root)' \
-    --file /var/service/mariadb/control/d 'attr(0750,root,root)' \
-    --file /var/service/mariadb/control/i 'attr(0750,root,root)' \
-    --file /var/service/mariadb/control/q 'attr(0750,root,root)' \
-    --file /var/service/mariadb/log/run 'attr(0755,root,root)' \
     --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
     --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
     > %{name}-%{version}-filelist
@@ -829,10 +849,6 @@ if [ $1 -gt 1 ] ; then
 	/usr/bin/sv d mariadb
 	/usr/bin/sv d mariadb/log
   fi
-  if [ -e /var/service/mariadb ] ; then
-        rm -rf /var/service/mariadb
-  fi
-
 fi
 
 %post