Skip to content

Commit 011497b

Browse files
committed
MDEV-9869 INSTALL SONAME 'ha_connect'
make storage engine RPMs require the exact server version RPM: "MariaDB = %{version}-%{release}", other plugins require simply "MariaDB", as before.
1 parent 250a89c commit 011497b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

cmake/plugin.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,11 @@ MACRO(MYSQL_ADD_PLUGIN)
194194
# Install dynamic library
195195
IF(ARG_COMPONENT)
196196
IF(CPACK_COMPONENTS_ALL AND NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT})
197+
IF (ARG_STORAGE_ENGINE)
198+
SET(ver " = %{version}-%{release}")
199+
ENDIF()
197200
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} PARENT_SCOPE)
198-
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB" PARENT_SCOPE)
201+
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB${ver}" PARENT_SCOPE)
199202

200203
IF (NOT ARG_CONFIG)
201204
SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf")

0 commit comments

Comments
 (0)