--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/14 15:12:24 1.19 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/04/02 21:58:15 1.24 @@ -2,13 +2,14 @@ Summary: Koozali SME Server specific mys %define name smeserver-mysql Name: %{name} %define version 2.7.0 -%define release 7 +%define release 12 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -31,6 +32,7 @@ mysql. %prep %setup %patch0 -p1 +%patch1 -p1 %build for ver in 101 102 103 105 @@ -114,11 +116,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 @@ -338,6 +341,18 @@ Koozali SME Server configuration package %changelog +* Sat Apr 02 2022 Jean-Philippe Pialasse 2.7.0-12.sme +- remove SourcePath from mysql-init service file [SME: 11922] + +* Wed Mar 16 2022 Jean-Philippe Pialasse 2.7.0-11.sme +- fix mariadb*-mysql.init path in service file [SME: 11899] + +* Wed Mar 16 2022 Jean-Philipe Pialasse 2.7.0-10.sme +- fix sclo metadata path for sql/init templated scripts [SME: 11899] + +* Wed Mar 16 2022 Jean-Philipe Pialasse 2.7.0-8.sme +- missing sockets for backup of db [SME: 11899] + * Mon Mar 14 2022 Jean-Philippe Pialasse 2.7.0-7.sme - adding requirement for mariadb-server-utils (105 and 103) [SME: 11899]