From cd59e93ccb06eaf4c7e206d246c0d0c61ca2ffd1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Thu, 5 Jun 2025 16:23:33 -0400 Subject: [PATCH] * Thu Jun 05 2025 Jean-Philippe Pialasse 11.0.0-17.sme - fix conflict with MariaDB-server-compat [SME: 13024] --- createlinks | 10 +++++----- smeserver-mysql.spec | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/createlinks b/createlinks index 20b4f9f..bb8928b 100755 --- a/createlinks +++ b/createlinks @@ -5,18 +5,18 @@ use esmith::Build::CreateLinks qw(:all); # we add few link fromn old mysql things to mariadb things # some are provided by MariaDB-client-compat #safe_symlink("/usr/bin/mariadb-dump","root/usr/bin/mysqldump"); -safe_symlink("/usr/bin/mariadb-dumpslow","root/usr/bin/mysqldumpslow"); +#safe_symlink("/usr/bin/mariadb-dumpslow","root/usr/bin/mysqldumpslow"); #safe_symlink("/usr/bin/mariadb-check","root/usr/bin/mysqlcheck"); #safe_symlink("/usr/bin/mariadb-admin","root/usr/bin/mysqladmin"); #safe_symlink("/usr/bin/mariadb-show","root/usr/bin/mysqlshow"); -safe_symlink("/usr/bin/mariadb-upgrade","root/usr/bin/mysql_upgrade"); +#safe_symlink("/usr/bin/mariadb-upgrade","root/usr/bin/mysql_upgrade"); #safe_symlink("/usr/bin/mariadb","root/usr/bin/mysql"); #safe_symlink("/usr/bin/mariadb-access","root/usr/bin/mysqlaccess"); #safe_symlink("/usr/bin/mariadb-binlog","root/usr/bin/mysqlbinlog"); -safe_symlink("/usr/bin/mariadb-convert-table-format","root/usr/bin/mysql_convert_table_format"); +#safe_symlink("/usr/bin/mariadb-convert-table-format","root/usr/bin/mysql_convert_table_format"); #safe_symlink("/usr/bin/mariadb-find-rows","root/usr/bin/mysql_find_rows"); -safe_symlink("/usr/bin/mariadb-fix-extensions","root/usr/bin/mysql_fix_extensions"); -safe_symlink("/usr/bin/mariadb-install-db","root/usr/bin/mysql_install_db"); +#safe_symlink("/usr/bin/mariadb-fix-extensions","root/usr/bin/mysql_fix_extensions"); +#safe_symlink("/usr/bin/mariadb-install-db","root/usr/bin/mysql_install_db"); #safe_symlink("/usr/bin/mariadb-embedded","root/usr/bin/mysql_embedded"); #-------------------------------------------------- diff --git a/smeserver-mysql.spec b/smeserver-mysql.spec index 8d7b4b8..cc3763f 100644 --- a/smeserver-mysql.spec +++ b/smeserver-mysql.spec @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mysql configuration and templates. %define name smeserver-mysql Name: %{name} %define version 11.0.0 -%define release 16 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -37,6 +37,7 @@ Requires: MariaDB-gssapi-server #Requires: MariaDB-compat Requires: mariadb-common ,mariadb-errmsg,mariadb-server-utils Requires: MariaDB-client-compat +Requires: MariaDB-server-compat AutoReqProv: no @@ -80,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %changelog +* Thu Jun 05 2025 Jean-Philippe Pialasse 11.0.0-17.sme +- fix conflict with MariaDB-server-compat [SME: 13024] + * Wed May 14 2025 Jean-Philippe Pialasse 11.0.0-16.sme - fix conflict with MariaDB-client-compat [SME: 13005]