Skip to content

Commit 9c9282a

Browse files
committed
MDEV-39803 RPM dependencies missing from MariaDB-server-galera package
RPM dependencies where not included in cpack build due to incorrect component name. Corrects a103be3 Becase the wsrep_info plugin installs as a plugin, it overrites the cpack_rpm server-galera PACKAGE_DEPENDS. As such make the cmake/plugin.cmake only sets the PACKAGE_DEPENDS if not already set. This allows plugin to override automatic REQUIRES, fine-tuning their own dependencies
1 parent 51263b8 commit 9c9282a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

cmake/cpack_rpm.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,12 @@ SETA(CPACK_RPM_server_PACKAGE_REQUIRES
270270
"MariaDB-client >= 11.0.0")
271271

272272
IF(WITH_WSREP)
273-
SETA(CPACK_RPM_server_galera_PACKAGE_REQUIRES
273+
SETA(CPACK_RPM_server-galera_PACKAGE_REQUIRES
274274
"MariaDB-server >= ${SERVER_VERSION}"
275275
"galera-4" "rsync" "grep" "gawk" "iproute"
276276
"coreutils" "findutils" "tar")
277-
SETA(CPACK_RPM_server_galera_PACKAGE_RECOMMENDS "lsof" "socat" "pv")
278-
SETA(CPACK_RPM_server_galera_PACKAGE_CONFLICTS
277+
SETA(CPACK_RPM_server-galera_PACKAGE_RECOMMENDS "lsof" "socat" "pv")
278+
SETA(CPACK_RPM_server-galera_PACKAGE_CONFLICTS
279279
"MariaDB-server <= 12.3.2")
280280
ENDIF()
281281

cmake/plugin.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ MACRO(MYSQL_ADD_PLUGIN)
275275
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} ${ARG_COMPONENT}Symlinks)
276276
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
277277

278-
IF (NOT ARG_CLIENT)
278+
IF (NOT ARG_CLIENT AND NOT CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES)
279279
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server${ver}" PARENT_SCOPE)
280280
ENDIF()
281281
SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE)

0 commit comments

Comments
 (0)