diff options
| author | Daniel Black <daniel@mariadb.org> | 2023-02-10 18:40:43 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-02-10 18:43:37 +1100 |
| commit | 3294ef9186beb0842ad1ba38d4952b9a7fc2a7e8 (patch) | |
| tree | 5e33d4a466296388c4ef385107bfe204e9ae0649 | |
| parent | d385856d10883029e7e2c7904603dc6774e5e338 (diff) | |
| download | mariadb-git-bb-11.0-danielblack-preview-MDEV-30203-pkgtest.tar.gz | |
MDEV-30571 MariaDB-client does not pull MariaDB-compat anymore, conflicts with RHEL packagesbb-11.0-danielblack-preview-MDEV-30203-pkgtest
Make MariaDB-client explictly pull MariaDB-common. I can't see
a reason for the change between 10.9.
Use SETA rather than set for common/compat dependencies out of caution.
Last commit seems to have resolved the common dependency on compat
(though its not obvious why).
| -rw-r--r-- | cmake/cpack_rpm.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 952ce94a39a..abac09eace2 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -206,6 +206,8 @@ SETA(CPACK_RPM_client_PACKAGE_PROVIDES "mytop") SETA(CPACK_RPM_client_PACKAGE_CONFLICTS "MariaDB-server < 11.0.0") +SETA(CPACK_RPM_client_PACKAGE_REQUIRES + "MariaDB-common") SETA(CPACK_RPM_common_PACKAGE_CONFLICTS "MariaDB-server < 10.6.1") @@ -361,8 +363,8 @@ IF(compat53 AND compat101) # Make sure that for these distributions all our rpms require # MariaDB-compat, that will replace mysql-libs-5.1 IF(RPM MATCHES "(rhel|centos)[67]") - SET(CPACK_RPM_common_PACKAGE_REQUIRES "MariaDB-compat") - SET(CPACK_RPM_compat_PACKAGE_CONFLICTS "mariadb-libs < 1:10.1.0") + SETA(CPACK_RPM_common_PACKAGE_REQUIRES "MariaDB-compat") + SETA(CPACK_RPM_compat_PACKAGE_CONFLICTS "mariadb-libs < 1:10.1.0") ENDIF() ENDIF() |