* Thu Jun 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme

- fix conflict with MariaDB-server-compat [SME: 13024]
This commit is contained in:
Jean-Philippe Pialasse 2025-06-05 16:23:33 -04:00
parent 87537e32b8
commit cd59e93ccb
2 changed files with 10 additions and 6 deletions

View File

@ -5,18 +5,18 @@ use esmith::Build::CreateLinks qw(:all);
# we add few link fromn old mysql things to mariadb things # we add few link fromn old mysql things to mariadb things
# some are provided by MariaDB-client-compat # some are provided by MariaDB-client-compat
#safe_symlink("/usr/bin/mariadb-dump","root/usr/bin/mysqldump"); #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-check","root/usr/bin/mysqlcheck");
#safe_symlink("/usr/bin/mariadb-admin","root/usr/bin/mysqladmin"); #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-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","root/usr/bin/mysql");
#safe_symlink("/usr/bin/mariadb-access","root/usr/bin/mysqlaccess"); #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-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-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-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-install-db","root/usr/bin/mysql_install_db");
#safe_symlink("/usr/bin/mariadb-embedded","root/usr/bin/mysql_embedded"); #safe_symlink("/usr/bin/mariadb-embedded","root/usr/bin/mysql_embedded");
#-------------------------------------------------- #--------------------------------------------------

View File

@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mysql configuration and templates.
%define name smeserver-mysql %define name smeserver-mysql
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 16 %define release 17
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -37,6 +37,7 @@ Requires: MariaDB-gssapi-server
#Requires: MariaDB-compat #Requires: MariaDB-compat
Requires: mariadb-common ,mariadb-errmsg,mariadb-server-utils Requires: mariadb-common ,mariadb-errmsg,mariadb-server-utils
Requires: MariaDB-client-compat Requires: MariaDB-client-compat
Requires: MariaDB-server-compat
AutoReqProv: no AutoReqProv: no
@ -80,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Thu Jun 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme
- fix conflict with MariaDB-server-compat [SME: 13024]
* Wed May 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme * Wed May 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme
- fix conflict with MariaDB-client-compat [SME: 13005] - fix conflict with MariaDB-client-compat [SME: 13005]