From 320351c65970634f0b71ac8fa7aece23ce684d3e Mon Sep 17 00:00:00 2001 From: GreatSQL Date: Tue, 1 Apr 2025 10:04:14 +0800 Subject: [PATCH] Remove greatsql-mysql-config, greatsql-shared-compat Clearly declare the conflicts list --- greatsql.spec | 69 +++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 41 deletions(-) diff --git a/greatsql.spec b/greatsql.spec index 8d26596..cb03746 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 1 +%global rpm_release 2 %global release %{greatsql_version}.%{rpm_release}%{?dist} @@ -206,6 +206,10 @@ BuildRequires: zlib BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Conflicts: community-mysql mysql-community +Conflicts: mariadb +Conflicts: Percona-Server + # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering %global __requires_exclude ^perl\\(GD|hostnames|lib::mtr|lib::v1|mtr_|My::|Lmo|Lmo::Meta|Lmo::Object|Lmo::Types|Lmo::Utils|Percona::Toolkit|Quoter|Transformers) %global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so|%{_bindir}/mysql.*|%{_sbindir}/mysqld.*)$ @@ -232,8 +236,9 @@ Requires(pre): greatsql-shared Requires: greatsql-client Requires: greatsql-icu-data-files Requires: openssl -Conflicts: Percona-SQL-server-50 Percona-Server-server-51 Percona-Server-server-55 Percona-Server-server-56 Percona-Server-server-57 - +Conflicts: mysql-server mysql-community-server +Conflicts: mariadb-server mariadb-galera-server mariadb-connector-c-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 Requires(preun): systemd @@ -244,8 +249,6 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service %endif -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. @@ -255,7 +258,9 @@ For a description of GreatSQL see https://greatsql.cn Summary: GreatSQL - Client Group: Applications/Databases Requires: greatsql-shared -Conflicts: Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-client-55 Percona-Server-client-56 Percona-Server-client-57 +Conflicts: mysql-client mysql-community-client +Conflicts: 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 This package contains the standard GreatSQL client and administration tools. @@ -294,10 +299,9 @@ Requires: perl(Sys::Hostname) Requires: perl(Time::HiRes) Requires: perl(Time::localtime) Requires(pre): greatsql-shared greatsql-client greatsql-server -Conflicts: MySQL-test -Conflicts: mysql-test +Conflicts: mysql-test mysql-community-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 +Conflicts: Percona-SQL-test-50 Percona-Server-test-51 Percona-Server-test-55 Percona-Server-test-56 Percona-Server-test-57 Percona-Server-test %description -n greatsql-test This package contains the GreatSQL regression test suite. @@ -307,9 +311,9 @@ For a description of GreatSQL see https://greatsql.cn %package -n greatsql-devel 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 -Conflicts: mariadb-connector-c-devel -Conflicts: mariadb-devel +Conflicts: mysql-devel mysql-community-devel +Conflicts: mariadb-devel mariadb-connector-c-devel +Conflicts: Percona-SQL-devel-50 Percona-Server-devel-51 Percona-Server-devel-55 Percona-Server-devel-56 Percona-Server-devel-57 Percona-Server-devel %description -n greatsql-devel This package contains the development header files and libraries necessary @@ -320,7 +324,9 @@ For a description of GreatSQL see https://greatsql.cn %package -n greatsql-shared Summary: GreatSQL - Shared libraries Group: Applications/Databases -Conflicts: mysql-libs < %{version}-%{release} +Conflicts: mysql-libs mysql-community-libs mysql-libs < %{version}-%{release} +Conflicts: mariadb-libs +Conflicts: Percona-Server-shared-51 Percona-Server-shared-55 Percona-Server-shared-55 Percona-Server-shared-56 Percona-Server-shared-57 Percona-Server-shared %description -n greatsql-shared This package contains the shared libraries (*.so*) which certain languages @@ -328,24 +334,6 @@ and applications need to dynamically load and use GreatSQL. For a description of GreatSQL see https://greatsql.cn -%if 0%{?compatlib} -%package -n greatsql-shared-compat -Summary: Shared compat libraries for GreatSQL %{compatver}-%{percona_compatver} database client applications -Group: Applications/Databases - -Conflicts: mysql-libs - -Conflicts: Percona-Server-shared-51 -Conflicts: Percona-Server-shared-55 -Conflicts: Percona-Server-shared-55 -Conflicts: Percona-Server-shared-56 -Conflicts: Percona-Server-shared-57 - -%description -n greatsql-shared-compat -This package contains the shared compat libraries for GreatSQL %{compatver}-%{percona_compatver} client -applications. -%endif - %if 0%{?tokudb} %package -n greatsql-tokudb Summary: GreatSQL - TokuDB package @@ -354,6 +342,7 @@ Requires: greatsql-server = %{version}-%{release} Requires: greatsql-shared = %{version}-%{release} Requires: greatsql-client = %{version}-%{release} Requires: jemalloc >= 3.3.0 +Conflicts: Percona-server-tokudb %description -n greatsql-tokudb This package contains the TokuDB plugin for GreatSQL %{version}-%{release} @@ -366,6 +355,7 @@ Group: Applications/Databases Requires: greatsql-server = %{version}-%{release} Requires: greatsql-shared = %{version}-%{release} Requires: greatsql-client = %{version}-%{release} +Conflicts: Percona-server-rocksdb %description -n greatsql-rocksdb This package contains the RocksDB plugin for GreatSQL %{version}-%{release} @@ -378,6 +368,8 @@ Summary: GreatSQL MySQL Router Group: Applications/Databases Provides: greatsql-mysql-router = %{version}-%{release} Obsoletes: greatsql-mysql-router < %{version}-%{release} +Conflicts: mysql-router mysql-router-community +Conflicts: percona-mysql-router %description -n greatsql-mysql-router The GreatSQL MySQL Router software delivers a fast, multi-threaded way of @@ -390,6 +382,7 @@ Summary: Development header files and libraries for GreatSQL MySQL Router Group: Applications/Databases Provides: greatsql-mysql-router-devel = %{version}-%{release} Conflicts: mysql-router-devel +Conflicts: percona-mysql-router-devel %description -n greatsql-mysql-router-devel This package contains the development header files and libraries @@ -397,16 +390,6 @@ necessary to develop GreatSQL MySQL Router applications. For a description of GreatSQL see https://greatsql.cn -%package -n greatsql-mysql-config -Summary: GreatSQL config -Provides: greatsql-mysql-config = %{version}-%{release} -Conflicts: mysql-config - -%description -n greatsql-mysql-config -This package contains my.cnf for GreatSQL. - -For a description of GreatSQL see https://greatsql.cn - %package -n greatsql-icu-data-files Summary: GreatSQL packaging of ICU data files @@ -1093,5 +1076,9 @@ fi %{_libdir}/mysql/private/icudt69l/brkitr %changelog +* Tue Apr 1 2025 GreatSQL - 8.0.32-27.2 +- Remove greatsql-mysql-config, greatsql-shared-compat +- Clearly declare the conflicts list + * Mon Mar 10 2025 GreatSQL - 8.0.32-27.1 - Release GreatSQL-8.0.32-27.1 -- Gitee