--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2020/12/08 03:26:23	1.16
+++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2020/12/13 22:09:39	1.21
@@ -1,10 +1,10 @@
-# $Id: e-smith-mysql.spec,v 1.15 2020/12/08 02:55:37 jpp Exp $
+# $Id: e-smith-mysql.spec,v 1.20 2020/12/10 04:25:50 jpp Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
 %define version 2.6.0
-%define release 14
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,6 +18,7 @@ Patch4: e-smith-mysql-2.6.0.bz9671.Remov
 Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch
 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -29,13 +30,21 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
-* Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme
+* 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]
   move set.password and template
   create /usr/lib/systemd/system/mariadb.service.d/sme.conf
   create /sbin/e-smith/systemd/mariadb-initialize + chmod
-  cleanup 
+  cleanup and remove old /var/service/mariadb
 - mysql.init systemd integration [SME: 11120]
   create mysql_init.service
 
@@ -794,7 +803,11 @@ rm -rf root/etc/e-smith/templates/var/se
 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
 
 %build
 perl createlinks
@@ -804,12 +817,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