Skip to content

Commit 7588049

Browse files
committed
MDEV-25280: cpack_rpm - MariaDB-client file moves
This fixes the MariaDB-client RPM to conflict with < MariaDB-server-10.6 as a number of files where moved from the server to client component. see commits 09202b2 -> fa0ad2f
1 parent 1fde581 commit 7588049

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

cmake/cpack_rpm.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
152152
SETA(CPACK_RPM_client_PACKAGE_PROVIDES
153153
"MySQL-client"
154154
"mysql-client")
155+
SETA(CPACK_RPM_client_PACKAGE_CONFLICTS
156+
"MariaDB-server < 10.6.0")
155157

156158
SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
157159
"MySQL-devel")

0 commit comments

Comments
 (0)