--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec	2022/04/09 18:15:45	1.25
+++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec	2022/06/07 12:39:31	1.29
@@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mys
 %define name smeserver-mysql
 Name: %{name}
 %define version 2.7.0
-%define release 13
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -134,7 +134,7 @@ sed -i root$ver/etc/e-smith/templates/et
 	-e "s_/usr/bin/mysql_/opt/rh/rh-mariadb${ver}/root/usr/bin/mysql_g" \
 	-e "s_mariadb.service_mariadb$ver-mariadb.service_" \
 	-e "s_/var/run/mariadb/mariadb.pid_${pidfile}_g" \
-	-e "s_mysqld_rh-mariadb$ver-mariadb_g" \
+	-e "s_mysqld_mariadb$ver-mariadb_g" \
 	-e "s_| mysql |_| /opt/rh/rh-mariadb${ver}/root/usr/bin/mysql --socket=$socket |_g" \
 	-e "s_mysql\_upgrade_mysql\_upgrade --socket=$socket _g"
 mkdir -p root$ver/etc/e-smith/templates/etc/my.cnf
@@ -192,7 +192,8 @@ sed -i root$ver/usr/lib/systemd/system/m
 if [ $ver -ge  102 ]
 then
   sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \
-	-e "s/_safe//";
+	-e "s/_safe//" \
+	-e "s/^ExecStopPost.*//";
 fi
 if [ $ver -ge  104 ]
 then
@@ -343,6 +344,12 @@ Koozali SME Server configuration package
 
 
 %changelog
+* Tue Jun 07 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-15.sme
+- Fix init for MariaDB 104+ [SME:11991]
+
+* Sun Apr 10 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-14.sme
+- /usr/libexec/mysql-wait-stop not used after mariadb101 [SME: 11936]
+
 * Sat Apr 09 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-13.sme
 - fix few typos [SME: 11936]