[Cmake-commits] [cmake-commits] hoffman committed CPackRPM.cmake 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv5931

Modified Files:
	CPackRPM.cmake 
Log Message:
BUG: #7904  add rpm package depend 


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CPackRPM.cmake	22 Sep 2008 13:56:24 -0000	1.9
--- CPackRPM.cmake	3 Dec 2008 19:37:13 -0000	1.10
***************
*** 127,130 ****
--- 127,140 ----
  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
***************
*** 132,135 ****
--- 142,148 ----
  # 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)
***************
*** 178,189 ****
      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_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_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}
--- 191,201 ----
      MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_DIRECTORY          = ${CPACK_TOPLEVEL_DIRECTORY}")
      MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_TAG                = ${CPACK_TOPLEVEL_TAG}")
!     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   = ${CPACK_PACKAGE_INSTALL_DIRECTORY}")
      MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
    ENDIF(CPACK_RPM_PACKAGE_DEBUG)
    FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE}
***************
*** 197,200 ****
--- 209,213 ----
  Group:          ${CPACK_RPM_PACKAGE_GROUP}
  Vendor:         ${CPACK_RPM_PACKAGE_VENDOR}
+ ${TMP_RPM_REQUIRES}
  ${TMP_RPM_BUILDARCH}
  
***************
*** 229,232 ****
--- 242,248 ----
  
  %changelog
+ * Mon Oct 03 2008 Erk <eric.noulard at gmail.com>
+   Update generator to handle optional dependencies using Requires
+   Update DEBUG output typos. 
  * Mon Aug 25 2008 Erk <eric.noulard at gmail.com>
    Update generator to handle optional post-install