--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/14 06:42:25 1.17 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/16 07:48:37 1.22 @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mys %define name smeserver-mysql Name: %{name} %define version 2.7.0 -%define release 6 +%define release 10 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -13,6 +13,8 @@ Patch0: smeserver-mysql-2.7.0-bz11899-sc BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: mariadb-server +# mariadb after 5.5 /in Centos 8 will package mysql_upgrade in mariadb-server-utils +# Requires: /usr/bin/mysql_upgrade Requires: mariadb Requires: e-smith-base Requires: e-smith-lib >= 1.15.1-19 @@ -112,11 +114,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 @@ -236,7 +239,7 @@ do /sbin/e-smith/genfilelist root$ver/ \ --file "/sbin/e-smith/systemd/mariadb$ver-initialize" 'attr(0554,root,root)' \ --file "/sbin/e-smith/systemd/mariadb$ver-mysql.init" 'attr(0554,root,root)' \ - --file "/sbin/e-smith/systemd/mariadb$ver-post.init" 'attr(0554,root,root)' \ + --file "/sbin/e-smith/systemd/mariadb$ver-post" 'attr(0554,root,root)' \ --dir "/home/e-smith/db/mariadb$ver" 'attr(0750,root,root)' \ --dir "/var/log/mariadb$ver" 'attr(0750,mysql,mysql)' \ --file "/usr/bin/mysql$ver" 'attr(0554,root,root)' \ @@ -306,6 +309,7 @@ Group: Database Requires: rh-mariadb103 Requires: rh-mariadb103-mariadb Requires: rh-mariadb103-mariadb-server +Requires: rh-mariadb103-mariadb-server-utils BuildRequires: e-smith-devtools >= 1.13.1-03 %description -n smeserver-mariadb103 @@ -321,6 +325,7 @@ Group: Database Requires: rh-mariadb105 Requires: rh-mariadb105-mariadb Requires: rh-mariadb105-mariadb-server +Requires: rh-mariadb105-mariadb-server-utils BuildRequires: e-smith-devtools >= 1.13.1-03 Requires: smeserver-mysql >= 2.7.0-5 %description -n smeserver-mariadb105 @@ -334,6 +339,15 @@ Koozali SME Server configuration package %changelog +* 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] + * Mon Mar 14 2022 Jean-Philippe Pialasse 2.7.0-6.sme - fix password for mariadb 105 [SME: 11899]