diff --git a/greatsql.spec b/greatsql.spec index cb037468a44e21149c4d8ce1a2629fd8de686efc..0d545b1c359a8d3ce4667e3861da2b1380a53878 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 2 +%global rpm_release 3 %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 @@ -465,7 +467,7 @@ mkdir release -DWITH_SYSTEM_LIBS=ON \ -DWITH_LZ4=bundled \ -DWITH_ZLIB=bundled \ - -DWITH_PROTOBUF=bundled \ + -DWITH_PROTOBUF=system \ -DWITH_RAPIDJSON=bundled \ -DWITH_ICU=bundled \ -DWITH_READLINE=system \ @@ -520,6 +522,7 @@ install -d %{buildroot}%{_sysconfdir}/my.cnf.d # Add libdir to linker install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf +echo "%{_libdir}/mysql/private" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf # multiarch support %ifarch %{multiarchs} @@ -767,8 +770,6 @@ fi %endif %attr(755, root, root) %{_sbindir}/mysqld %dir %{_libdir}/mysql/private -%attr(755, root, root) %{_libdir}/mysql/private/libprotobuf-lite.so.* -%attr(755, root, root) %{_libdir}/mysql/private/libprotobuf.so.* %dir %{_libdir}/mysql/plugin %attr(755, root, root) %{_libdir}/mysql/plugin/procfs.so @@ -1061,7 +1062,6 @@ fi %{_libdir}/mysqlrouter/private/libmysqlrouter_http.so.* %{_libdir}/mysqlrouter/private/libmysqlrouter_http_auth_backend.so.* %{_libdir}/mysqlrouter/private/libmysqlrouter_http_auth_realm.so.* -%{_libdir}/mysqlrouter/private/libprotobuf-lite.so.* %dir %{_libdir}/mysqlrouter %dir %{_libdir}/mysqlrouter/private %{_libdir}/mysqlrouter/*.so @@ -1076,6 +1076,11 @@ fi %{_libdir}/mysql/private/icudt69l/brkitr %changelog +* Mon Apr 14 2025 GreatSQL - 8.0.32-27.3 +- greatsql-mysql-config was removed previously, my.cnf was moved + into greatsql-server package without conflicts and obsoletes +- add %{_libdir}/mysql/private into ld.so.conf.d/mysql-%{_arch}.conf + * Tue Apr 1 2025 GreatSQL - 8.0.32-27.2 - Remove greatsql-mysql-config, greatsql-shared-compat - Clearly declare the conflicts list