Skip to content

Commit 7d36006

Browse files
committed
MDEV-24629 mariadb-connector-c-config conflicts with MariaDB's MariaDB-common-10.5.8-1.fc32.x86_64.rpm
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.
1 parent edabb12 commit 7d36006

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

cmake/cpack_rpm.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,12 @@ ELSEIF(RPM MATCHES "sles")
252252
"mariadb-server = %{version}-%{release}"
253253
)
254254
ENDIF()
255+
256+
# MDEV-24629, we need it outside of ELSIFs
257+
IF(RPM MATCHES "fedora3[234]")
258+
ALTERNATIVE_NAME("common" "mariadb-connector-c-config" ${MARIADB_CONNECTOR_C_VERSION}-1)
259+
ENDIF()
260+
255261
SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")
256262

257263
# If we want to build build MariaDB-shared-compat,

0 commit comments

Comments
 (0)