From 6324ed81310e971e727a6527ccb90bf3cdad4b5e Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:58:18 +0100 Subject: [PATCH] replace mysql_upgrade with mariadb-upgrade and don't run on first install; fix chown warning [release 11.2.2-2mamba;Thu Dec 28 2023] --- mariadb.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 192d982..76bb815 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -6,7 +6,7 @@ Name: mariadb Version: 11.2.2 -Release: 1mamba +Release: 2mamba Summary: A SQL database engine designed as a drop-in replacement of MySQL(R) Group: Applications/Databases Vendor: openmamba @@ -295,7 +295,7 @@ if [ $1 -eq 1 ]; then # new install: initialize db mysql_install_db --basedir=%{_prefix} --ldata=/var/lib/mysql%{?MAJversion} fi - /bin/chown -R mysql.mysql /var/lib/mysql%{?MAJversion} + /bin/chown -R mysql:mysql /var/lib/mysql%{?MAJversion} systemctl -q enable mariadb systemctl -q start mariadb fi @@ -304,8 +304,10 @@ if [ $1 -ge 1 ]; then systemctl -q enable mariadb systemctl -q start mariadb } - mysql_upgrade || { - echo "Run: 'mysql_upgrade -u root -p' to upgrade db!" +fi +if [ $1 -gt 1 ]; then + mariadb-upgrade || { + echo "Run: 'mariadb-upgrade -u root -p' to upgrade db!" } fi : @@ -580,6 +582,9 @@ fi %{_mandir}/man3/mysql_*.3* %changelog +* Thu Dec 28 2023 Silvan Calarco 11.2.2-2mamba +- replace mysql_upgrade with mariadb-upgrade and don't run on first install; fix chown warning + * Tue Nov 21 2023 Automatic Build System 11.2.2-1mamba - automatic version update by autodist