--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/14 02:39:17 1.10 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/14 05:13:46 1.14 @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mys %define name smeserver-mysql Name: %{name} %define version 2.7.0 -%define release 4 +%define release 5 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -181,6 +181,11 @@ then sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \ -e "s/_safe//"; fi +if [ $ver -ge 104 ] +then + sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \ + -e 's_set.password$_set.password2_' +fi #### TODO check it is similar to rh one and functional ! @@ -188,7 +193,7 @@ fi mkdir root$ver/usr/bin for i in mysql mysqlshow mysqladmin mysqldump mysqlimport mysqlbinlog do - echo "/opt/rh/rh-mariadb${ver}/root/usr/bin/$i --socket=/var/lib/mysql/maradb${ver}.sock \"\$@\"" >root$ver/usr/bin/$i${ver} + echo "/opt/rh/rh-mariadb${ver}/root/usr/bin/$i --socket=/var/lib/mysql/mariadb${ver}.sock \"\$@\"" >root$ver/usr/bin/$i${ver} done #phpMyAdmin template @@ -307,7 +312,7 @@ Requires: rh-mariadb105 Requires: rh-mariadb105-mariadb Requires: rh-mariadb105-mariadb-server BuildRequires: e-smith-devtools >= 1.13.1-03 -Requires: smeserver-mysql >= 2.7.0-4 +Requires: smeserver-mysql >= 2.7.0-5 %description -n smeserver-mariadb105 Koozali SME Server configuration package for mariadb105 RH SCLo @@ -319,10 +324,10 @@ Koozali SME Server configuration package %changelog -* Sun Mar 13 2022 Jean-Philippe Pialasse 2.7.0-4.sme +* Sun Mar 13 2022 Jean-Philippe Pialasse 2.7.0-5.sme - fix typo in socket, seen with phpmyadmin [SME: 11899] - fix permissions for mariadb105 [SME: 11899] - revert change in release 2 for root password and fix set.password + create a dedicated set.password for mariadb>103 * Sun Mar 13 2022 Jean-Philippe Pialasse 2.7.0-3.sme - missing phpMyAdmin fragments [SME: 11899]