diff options
| author | Alexey Bychko <alexey.bychko@mariadb.com> | 2021-09-21 22:40:47 +0700 |
|---|---|---|
| committer | Alexey Bychko <alexey.bychko@mariadb.com> | 2021-09-22 01:15:55 +0700 |
| commit | 7d360060cb6ea2558820b343ef77d59584b0b805 (patch) | |
| tree | 21596ec64fea8156c563cbdbfdecb5ed72d1bf5a | |
| parent | edabb12509fa5a8c94348d0e803b5925c454cc86 (diff) | |
| download | mariadb-git-7d360060cb6ea2558820b343ef77d59584b0b805.tar.gz | |
MDEV-24629 mariadb-connector-c-config conflicts with MariaDB's MariaDB-common-10.5.8-1.fc32.x86_64.rpmbb-10.5-MDEV-24629
this fix is adding alternative name to MariaDB-common on Fedora.
the fix is placed outside of IF/ELSEIF blocks to do not overwrite
existing one for Fedora.
| -rw-r--r-- | cmake/cpack_rpm.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 583bb81dafd..630936b746c 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -252,6 +252,12 @@ ELSEIF(RPM MATCHES "sles") "mariadb-server = %{version}-%{release}" ) ENDIF() + +# MDEV-24629, we need it outside of ELSIFs +IF(RPM MATCHES "fedora3[234]") + ALTERNATIVE_NAME("common" "mariadb-connector-c-config" ${MARIADB_CONNECTOR_C_VERSION}-1) +ENDIF() + SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang") # If we want to build build MariaDB-shared-compat, |