--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/13 23:20:02 1.5 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/14 02:49:56 1.11 @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mys %define name smeserver-mysql Name: %{name} %define version 2.7.0 -%define release 3 +%define release 5 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -50,7 +50,7 @@ do # default values from /etc/opt/rh/rh-mariadb101/my.cnf.d/mariadb-server.cnf basedir="/opt/rh/rh-mariadb$ver/root/usr" datadir="/var/opt/rh/rh-mariadb$ver/lib/mysql" -socket="/var/lib/mysql/maradb$ver.sock" +socket="/var/lib/mysql/mariadb$ver.sock" logerror="/var//log/mariadb$ver/mariadb.log" #"/var/opt/rh/rh-mariadb$ver/log/mariadb/mariadb.log" pidfile="/var/run/rh-mariadb$ver-mariadb/mariadb.pid" @@ -188,12 +188,14 @@ 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 +mkdir -p root$ver/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/ sed rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_ \ - -e "s_!!!VER!!!_${ver}_g" > rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql${ver} + -e "s_!!!SOCKET!!!_$socket _g" \ + -e "s_!!!VER!!!_${ver}_g" > root$ver/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql${ver} done @@ -305,7 +307,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 %description -n smeserver-mariadb105 Koozali SME Server configuration package for mariadb105 RH SCLo @@ -317,6 +319,11 @@ Koozali SME Server configuration package %changelog +* 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 + * Sun Mar 13 2022 Jean-Philippe Pialasse 2.7.0-3.sme - missing phpMyAdmin fragments [SME: 11899]