diff --git a/greatsql.spec b/greatsql.spec index 932d810c917fa3e2c201bb9f00fcd713af20c345..f58ebb865802df4d9cf2c6dd07301d21b95fa0d0 100644 --- a/greatsql.spec +++ b/greatsql.spec @@ -32,7 +32,7 @@ %global greatsql_version 26 %global revision a68b3034c3d %global tokudb_backup_version %{mysql_version}-%{greatsql_version} -%global rpm_release 3 +%global rpm_release 4 %global release %{greatsql_version}.%{rpm_release}%{?dist} @@ -225,7 +225,7 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service %endif -Obsoletes: mariadb-connector-c-config +Conflicts: mariadb-connector-c-config %description -n greatsql-server GreatSQL: a high performance, highly reliable, easy to use, and high security database that can be used to replace MySQL or Percona Server. @@ -275,9 +275,9 @@ Requires: perl(Sys::Hostname) Requires: perl(Time::HiRes) Requires: perl(Time::localtime) Requires(pre): greatsql-shared greatsql-client greatsql-server -Obsoletes: MySQL-test < %{version}-%{release} -Obsoletes: mysql-test < %{version}-%{release} -Obsoletes: mariadb-test +Conflicts: MySQL-test +Conflicts: mysql-test +Conflicts: mariadb-test Conflicts: Percona-SQL-test-50 Percona-Server-test-51 Percona-Server-test-55 Percona-Server-test-56 Percona-Server-test-57 %description -n greatsql-test @@ -289,8 +289,8 @@ For a description of GreatSQL see https://greatsql.cn Summary: GreatSQL - Development header files and libraries Group: Applications/Databases Conflicts: Percona-SQL-devel-50 Percona-Server-devel-51 Percona-Server-devel-55 Percona-Server-devel-56 Percona-Server-devel-57 -Obsoletes: mariadb-connector-c-devel -Obsoletes: mariadb-devel +Conflicts: mariadb-connector-c-devel +Conflicts: mariadb-devel %description -n greatsql-devel This package contains the development header files and libraries necessary @@ -301,7 +301,7 @@ For a description of GreatSQL see https://greatsql.cn %package -n greatsql-shared Summary: GreatSQL - Shared libraries Group: Applications/Databases -Obsoletes: mysql-libs < %{version}-%{release} +Conflicts: mysql-libs < %{version}-%{release} %description -n greatsql-shared This package contains the shared libraries (*.so*) which certain languages @@ -314,7 +314,7 @@ For a description of GreatSQL see https://greatsql.cn Summary: Shared compat libraries for GreatSQL %{compatver}-%{percona_compatver} database client applications Group: Applications/Databases -Obsoletes: mysql-libs +Conflicts: mysql-libs Conflicts: Percona-Server-shared-51 Conflicts: Percona-Server-shared-55 @@ -370,7 +370,7 @@ For a description of GreatSQL see https://greatsql.cn Summary: Development header files and libraries for GreatSQL MySQL Router Group: Applications/Databases Provides: greatsql-mysql-router-devel = %{version}-%{release} -Obsoletes: mysql-router-devel +Conflicts: mysql-router-devel %description -n greatsql-mysql-router-devel This package contains the development header files and libraries @@ -1343,6 +1343,9 @@ fi %{_libdir}/mysql/private/icudt69l/brkitr %changelog +* Wed Dec 04 2024 Funda Wang - 8.0.32-26.4 +- use conflicts rather than obsoletes for mysql and mariadb sub packages + * Tue Nov 26 2024 laokz - 8.0.32-26.3 - Add riscv64 patch - Add missed condition of packaging mysql_config-%{__isa_bits}