From 88a7cedb609821f713fce241fea4f4ed38d08906 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 11 Apr 2025 13:35:37 +0800 Subject: [PATCH] add conflicts and obsoletes on greatsql-mysql-config package (cherry picked from commit 524bfc5a10548c1578673e59362c535e69f2828e) --- greatsql.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/greatsql.spec b/greatsql.spec index 95f428b..b629e55 100644 --- a/greatsql.spec +++ b/greatsql.spec @@ -32,7 +32,7 @@ %global greatsql_version 27 %global revision aa66a385910 %global tokudb_backup_version %{mysql_version}-%{greatsql_version} -%global rpm_release 4 +%global rpm_release 5 %global release %{greatsql_version}.%{rpm_release}%{?dist} @@ -236,8 +236,10 @@ Requires(pre): greatsql-shared Requires: greatsql-client Requires: greatsql-icu-data-files Requires: openssl -Conflicts: mysql-server mysql-community-server -Conflicts: mariadb-server mariadb-galera-server mariadb-connector-c-config +Conflicts: greatsql-mysql-config < %{version}-%{release} +Obsoletes: greatsql-mysql-config < %{version}-%{release} +Conflicts: mysql-server mysql-community-server mysql-config +Conflicts: mariadb-server mariadb-galera-server mariadb-connector-c-config mariadb-config Conflicts: Percona-SQL-server-50 Percona-Server-server-51 Percona-Server-server-55 Percona-Server-server-56 Percona-Server-server-57 Percona-Server-server %if 0%{?systemd} Requires(post): systemd @@ -258,8 +260,8 @@ For a description of GreatSQL see https://greatsql.cn Summary: GreatSQL - Client Group: Applications/Databases Requires: greatsql-shared -Conflicts: mysql-client mysql-community-client -Conflicts: mariadb-client +Conflicts: mysql mysql-client mysql-community-client +Conflicts: mariadb mariadb-client Conflicts: Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-client-55 Percona-Server-client-56 Percona-Server-client-57 Percona-Server-client %description -n greatsql-client @@ -1080,6 +1082,10 @@ fi %{_libdir}/mysql/private/icudt69l/brkitr %changelog +* Fri Apr 11 2025 Funda Wang - 8.0.32-27.5 +- greatsql-mysql-config was removed previously, my.cnf was moved + into greatsql-server package without conflicts and obsoletes + * Tue Apr 1 2025 GreatSQL - 8.0.32-27.4 - Remove greatsql-mysql-config, greatsql-shared-compat - Clearly declare the conflicts list -- Gitee