--- 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	2020/12/13 22:09:39	1.21
@@ -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.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 15
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -30,6 +30,14 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* 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]
@@ -809,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
@@ -829,10 +831,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