--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/04/09 18:22:07 1.26 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/07/11 15:56:58 1.30 @@ -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 16 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -11,6 +11,7 @@ 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 +Patch3: smeserver-mysql-2.7.0-bz11953-mysql.init-logging.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -35,6 +36,7 @@ mysql. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build for ver in 101 102 103 105 @@ -192,7 +194,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 @@ -233,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT --file "/sbin/e-smith/systemd/mysql.init" 'attr(0554,root,root)' \ --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \ --dir "/var/log/mariadb" 'attr(0750,mysql,mysql)' \ + --dir "/var/log/mysql.init" 'attr(0750,root,root)' \ > %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist @@ -343,6 +347,15 @@ Koozali SME Server configuration package %changelog +* Mon Jul 11 2022 Jean-Philippe Pialasse 2.7.0-16.sme +- use dedicated log file for *mysql.init [SME: 11953] + +* Tue Jun 07 2022 John Crisp 2.7.0-15.sme +- Fix init for MariaDB 104+ [SME:11991] + +* Sun Apr 10 2022 Jean-Philippe Pialasse 2.7.0-14.sme +- /usr/libexec/mysql-wait-stop not used after mariadb101 [SME: 11936] + * Sat Apr 09 2022 Jean-Philippe Pialasse 2.7.0-13.sme - fix few typos [SME: 11936]