--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec	2022/03/14 15:12:24	1.19
+++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec	2022/06/07 12:39:31	1.29
@@ -2,13 +2,15 @@ Summary: Koozali SME Server specific mys
 %define name smeserver-mysql
 Name: %{name}
 %define version 2.7.0
-%define release 7
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: smeserver-mysql-2.7.0-bz11899-sclo.patch
+Patch1: smeserver-mysql-2.7.0-bz11922-mysqlinit.patch
+Patch2: smeserver-mysql-2.7.0-bz11936.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -31,6 +33,8 @@ mysql.
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 for ver in  101 102 103 105
@@ -114,11 +118,12 @@ sed -i root$ver/etc/e-smith/events/actio
 	-i root$ver/etc/e-smith/events/actions/mariadb${ver}-delete-dumped-tables \
 	-i root$ver/etc/e-smith/events/actions/mariadb${ver}-dump-tables \
 	-i root$ver/etc/e-smith/events/actions/mariadb${ver}-load-tables \
-	-e "s_!!!VER!!!_${ver}_g" 
+	-e "s_!!!VER!!!_${ver}_g" \
+	-e "s_!!!SOCKET!!!_${socket}_g" 
 
 ##metadata
-mkdir -p root$ver/etc/e-smith/templates.metadata/etc/e-smith/
-cp -a root/etc/e-smith/templates.metadata/etc/e-smith/sql root$ver/etc/e-smith/templates.metadata/etc/e-smith/sql$ver
+mkdir -p root$ver/etc/e-smith/templates.metadata/etc/e-smith/sql
+cp -a root/etc/e-smith/templates.metadata/etc/e-smith/sql/init root$ver/etc/e-smith/templates.metadata/etc/e-smith/sql/init$ver
 
 
 ##templates
@@ -127,9 +132,9 @@ cp   root/etc/e-smith/templates/etc/e-sm
 sed -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/00_restore_dumped_dbs  -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/10mysql_upgrade \
 	-e "s_e-smith/db/mysql_e-smith/db/mariadb${ver}_g" \
 	-e "s_/usr/bin/mysql_/opt/rh/rh-mariadb${ver}/root/usr/bin/mysql_g" \
-	-e "s_mariadb.service_rh-mariadb$ver-mariadb.service_" \
+	-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
@@ -187,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
@@ -338,6 +344,27 @@ 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]
+
+* Sat Apr 02 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-12.sme
+- remove SourcePath from mysql-init service file [SME: 11922]
+
+* Wed Mar 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-11.sme
+- fix mariadb*-mysql.init path in service file [SME: 11899]
+
+* Wed Mar 16 2022 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-10.sme
+- fix sclo metadata path for sql/init templated scripts [SME: 11899]
+
+* Wed Mar 16 2022 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
+- missing sockets for backup of db [SME: 11899]
+
 * Mon Mar 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-7.sme
 - adding requirement for mariadb-server-utils (105 and 103) [SME: 11899]