diff --git a/greatsql.spec b/greatsql.spec
index d323daa4b27985702d944ef472c8aa5066d76924..ddf77432592236655f41fe752996e1742249395f 100644
--- a/greatsql.spec
+++ b/greatsql.spec
@@ -31,7 +31,7 @@
 %global mysql_version 8.0.32
 %global greatsql_version 27
 %global revision aa66a385910
-%global rpm_release 6
+%global rpm_release 7
 
 %global release %{greatsql_version}.%{rpm_release}%{?dist}
 
@@ -204,7 +204,6 @@ Requires:       shadow-utils
 Requires:       net-tools
 Requires(pre):  greatsql-shared
 Requires:       greatsql-client
-Requires:       greatsql-icu-data-files
 Requires:       openssl
 Provides:       greatsql-server%{?_isa} = %{version}-%{release}
 Provides:       greatsql-server = %{version}-%{release}
@@ -213,6 +212,10 @@ Provides:       greatsql-server = %{version}-%{release}
 %{?with_conflicts:Conflicts:        mariadb-galera-server}
 %{?with_conflicts:Conflicts:        percona-server}
 %{?with_conflicts:Conflicts:        greatsql-server-57}
+Conflicts:      greatsql-test < %{version}-%{release}
+Obsoletes:      greatsql-test < %{version}-%{release}
+Conflicts:      greatsql-icu-data-files < %{version}-%{release}
+Obsoletes:      greatsql-icu-data-files < %{version}-%{release}
 %if 0%{?systemd}
 Requires(post):   systemd
 Requires(preun):  systemd
@@ -240,6 +243,8 @@ Provides:       greatsql-client = %{version}-%{release}
 %{?with_conflicts:Conflicts:        mariadb-client}
 %{?with_conflicts:Conflicts:        percona-server-client}
 %{?with_conflicts:Conflicts:        greatsql-client-57}
+Conflicts:      greatsql-mysql-config < %{version}-%{release}
+Obsoletes:      greatsql-mysql-config < %{version}-%{release}
 
 %description -n greatsql-client
 This package contains the standard GreatSQL client and administration tools.
@@ -282,7 +287,6 @@ Summary:       GreatSQL MySQL Router
 Group:         Applications/Databases
 Provides:      greatsql-mysql-router%{?_isa} = %{version}-%{release}
 Provides:      greatsql-mysql-router = %{version}-%{release}
-Obsoletes:     greatsql-mysql-router < %{version}-%{release}
 
 %description -n greatsql-mysql-router
 The GreatSQL MySQL Router software delivers a fast, multi-threaded way of
@@ -302,14 +306,6 @@ necessary to develop GreatSQL MySQL Router applications.
 
 For a description of GreatSQL see https://greatsql.cn
 
-%package   -n   greatsql-icu-data-files
-Summary:        GreatSQL packaging of ICU data files
-
-%description -n greatsql-icu-data-files
-This package contains ICU data files needer by GreatSQL regular expressions.
-
-For a description of GreatSQL see https://greatsql.cn
-
 %prep
 %setup -q -T -a 0 -a 10 -c -n %{src_dir}
 pushd %{src_dir}
@@ -669,6 +665,7 @@ fi
 %attr(755, root, root) %{_bindir}/zstd_decompress
 %attr(755, root, root) %{_bindir}/mysqldecompress
 %attr(755, root, root) %{_bindir}/mysql_migrate_keyring
+%attr(755, root, root) %{_bindir}/mysql_keyring_encryption_test
 %if 0%{?systemd}
 %attr(755, root, root) %{_bindir}/mysqld_pre_systemd
 %attr(755, root, root) %{_bindir}/mysqld_safe
@@ -679,6 +676,9 @@ fi
 %attr(755, root, root) %{_sbindir}/mysqld
 %dir %{_libdir}/mysql/private
 %attr(755, root, root) %{_libdir}/mysql/private/libfido2.so.*
+%dir %attr(755, root, root) %{_libdir}/mysql/private/icudt69l
+%{_libdir}/mysql/private/icudt69l/unames.icu
+%{_libdir}/mysql/private/icudt69l/brkitr
 
 %dir %{_libdir}/mysql/plugin
 %attr(755, root, root) %{_libdir}/mysql/plugin/procfs.so
@@ -888,14 +888,11 @@ fi
 %dir %attr(755, mysqlrouter, mysqlrouter) /var/log/mysqlrouter
 %dir %attr(755, mysqlrouter, mysqlrouter) /var/run/mysqlrouter
 
-%files -n greatsql-icu-data-files
-%defattr(-, root, root, -)
-%doc %{?license_files_server}
-%dir %attr(755, root, root) %{_libdir}/mysql/private/icudt69l
-%{_libdir}/mysql/private/icudt69l/unames.icu
-%{_libdir}/mysql/private/icudt69l/brkitr
-
 %changelog
+* Wed Apr 23 2025 GreatSQL <greatsql@greatdb.com> - 8.0.32-27.7
+- add conflicts and obsoletes on greatsql-test/greatsql-icu-data-files package
+- remove greatsql-icu-data-files package
+
 * Mon Apr 21 2025 GreatSQL <greatsql@greatdb.com> - 8.0.32-27.6
 - all pkg_name provides rename to greatsql prefix