diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-04-08 17:30:04 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-04-08 17:30:04 +1000 |
| commit | 1bed7cc0b5904f36d49f486decf608445cd6cc7e (patch) | |
| tree | cb57527ead61a3dacbd36e6d56ecc9caf24b5dde | |
| parent | c2a63ac526bf4cd269def30a3d55ff29fdba8f86 (diff) | |
| download | mariadb-git-bb-10.6-danielblack-MDEV-25280-rpm-client-file-moves-fix.tar.gz | |
MDEV-25280: cpack_rpm - MariaDB-client file movesbb-10.6-danielblack-MDEV-25280-rpm-client-file-moves-fix
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 09202b2e6db0f2308c5c669322b057ac7f100378 ->
fa0ad2fb11859fdeec93bbf3c4a6fc418eb372ac
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 873a75fb9e5..69688833c41 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -152,6 +152,8 @@ SETA(CPACK_RPM_client_PACKAGE_OBSOLETES SETA(CPACK_RPM_client_PACKAGE_PROVIDES "MySQL-client" "mysql-client") +SETA(CPACK_RPM_client_PACKAGE_CONFLICTS + "MariaDB-server < 10.6.0") SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES "MySQL-devel") |