From e87d252e95fa0121f02c81ffec05ccf3033d8ebd Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 3 Dec 2008 14:37:13 -0500 Subject: [PATCH] BUG: #7904 add rpm package depend --- Modules/CPackRPM.cmake | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index e441e69ea..8b55d722d 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -126,11 +126,24 @@ IF (NOT CPACK_RPM_PACKAGE_DESCRIPTION) ENDIF (CPACK_PACKAGE_DESCRIPTION_FILE) ENDIF (NOT CPACK_RPM_PACKAGE_DESCRIPTION) +# CPACK_RPM_PACKAGE_REQUIRES +# Placeholder used to specify binary RPM dependencies (if any) +# see http://www.rpm.org/max-rpm/s1-rpm-depend-manual-dependencies.html +IF(CPACK_RPM_PACKAGE_REQUIRES) + IF(CPACK_RPM_PACKAGE_DEBUG) + MESSAGE("CPackRPM:Debug: User defined Requires:\n ${CPACK_RPM_PACKAGE_REQUIRES}") + ENDIF(CPACK_RPM_PACKAGE_DEBUG) + SET(TMP_RPM_REQUIRES "Requires: ${CPACK_RPM_PACKAGE_REQUIRES}") +ENDIF(CPACK_RPM_PACKAGE_REQUIRES) + # CPACK_RPM_SPEC_INSTALL_POST # May be used to define a RPM post intallation script # for example setting it to "/bin/true" may prevent # rpmbuild from stripping binaries. IF(CPACK_RPM_SPEC_INSTALL_POST) + IF(CPACK_RPM_PACKAGE_DEBUG) + MESSAGE("CPackRPM:Debug: User defined CPACK_RPM_SPEC_INSTALL_POST = ${CPACK_RPM_SPEC_INSTALL_POST}") + ENDIF(CPACK_RPM_PACKAGE_DEBUG) SET(TMP_RPM_SPEC_INSTALL_POST "%define __spec_install_post ${CPACK_RPM_SPEC_INSTALL_POST}") ENDIF(CPACK_RPM_SPEC_INSTALL_POST) @@ -177,14 +190,13 @@ ELSE(CPACK_RPM_USER_BINARY_SPECFILE) IF(CPACK_RPM_PACKAGE_DEBUG) MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}") MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_TAG = ${CPACK_TOPLEVEL_TAG}") - MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_DIRECTORY = ${PACK_TEMPORARY_DIRECTORY}") + MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_DIRECTORY = ${CPACK_TEMPORARY_DIRECTORY}") MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_NAME = ${CPACK_OUTPUT_FILE_NAME}") MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_PATH = ${CPACK_OUTPUT_FILE_PATH}") MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}") MESSAGE("CPackRPM:Debug: CPACK_RPM_BINARY_SPECFILE = ${CPACK_RPM_BINARY_SPECFILE}") - MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY = ${PACK_PACKAGE_INSTALL_DIRECTORY}") + MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY = ${CPACK_PACKAGE_INSTALL_DIRECTORY}") MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}") - MESSAGE("CPackRPM:Debug: CPACK_RPM_SPEC_INSTALL_POST = ${CPACK_RPM_SPEC_INSTALL_POST}") ENDIF(CPACK_RPM_PACKAGE_DEBUG) FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE} "# -*- rpm-spec -*- @@ -196,6 +208,7 @@ Release: ${CPACK_RPM_PACKAGE_RELEASE} License: ${CPACK_RPM_PACKAGE_LICENSE} Group: ${CPACK_RPM_PACKAGE_GROUP} Vendor: ${CPACK_RPM_PACKAGE_VENDOR} +${TMP_RPM_REQUIRES} ${TMP_RPM_BUILDARCH} #%define prefix ${CMAKE_INSTALL_PREFIX} @@ -228,6 +241,9 @@ ${CPACK_RPM_PACKAGE_DESCRIPTION} /* %changelog +* Mon Oct 03 2008 Erk + Update generator to handle optional dependencies using Requires + Update DEBUG output typos. * Mon Aug 25 2008 Erk Update generator to handle optional post-install * Tue Aug 16 2007 Erk