[Cmake-commits] [cmake-commits] alex committed CPackRPM.cmake 1.10 1.11

[cmake-commits at cmake.org]

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

Modified Files:
	CPackRPM.cmake 
Log Message:
BUG: apply patch from Eric Noulard, so cpack works with rpmbuild 4.6.0, #8967

Alex


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** CPackRPM.cmake	3 Dec 2008 19:37:13 -0000	1.10
--- CPackRPM.cmake	12 May 2009 19:13:10 -0000	1.11
***************
*** 18,25 ****
--- 18,45 ----
  FIND_PROGRAM(RPMBUILD_EXECUTABLE rpmbuild)
  
+ # Check version of the rpmbuild tool this would be easier to 
+ # track bugs with users and CPackRPM debug mode.
+ # We may use RPM version in order to check for available version dependent features 
+ IF(RPMBUILD_EXECUTABLE)
+   execute_process(COMMAND ${RPMBUILD_EXECUTABLE} --version
+                   OUTPUT_VARIABLE _TMP_VERSION
+                   ERROR_QUIET
+                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+   string(REGEX REPLACE "^.*\ " ""   
+          RPMBUILD_EXECUTABLE_VERSION
+          ${_TMP_VERSION})     
+   IF(CPACK_RPM_PACKAGE_DEBUG)
+     MESSAGE("CPackRPM:Debug: rpmbuild version is <${RPMBUILD_EXECUTABLE_VERSION}>")
+   ENDIF(CPACK_RPM_PACKAGE_DEBUG)  
+ ENDIF(RPMBUILD_EXECUTABLE)
+ 
  IF(NOT RPMBUILD_EXECUTABLE)
    MESSAGE(FATAL_ERROR "RPM package requires rpmbuild executable")
  ENDIF(NOT RPMBUILD_EXECUTABLE)
  
+ # We may use RPM version in the future in order
+ # to shut down warning about space in buildtree 
+ # some recent RPM version should support space in different places.
+ # not checked [yet].
  IF(CPACK_TOPLEVEL_DIRECTORY MATCHES ".* .*")
    MESSAGE(FATAL_ERROR "${RPMBUILD_EXECUTABLE} can't handle paths with spaces, use a build directory without spaces for building RPMs.")
***************
*** 256,263 ****
    # Now call rpmbuild using the SPECFILE
    EXECUTE_PROCESS(
!     COMMAND "${RPMBUILD_EXECUTABLE}" -bb "${CPACK_RPM_BINARY_SPECFILE}"
      WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
      ERROR_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.err"
!     OUTPUT_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.out")
    IF(CPACK_RPM_PACKAGE_DEBUG)
      MESSAGE("CPackRPM:Debug: You may consult rpmbuild logs in: ")
--- 276,285 ----
    # Now call rpmbuild using the SPECFILE
    EXECUTE_PROCESS(
!     COMMAND "${RPMBUILD_EXECUTABLE}" -bb 
!             --buildroot "${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}" 
!             "${CPACK_RPM_BINARY_SPECFILE}"
      WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
      ERROR_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.err"
!     OUTPUT_FILE "${CPACK_TOPLEVEL_DIRECTORY}/rpmbuild.out")  
    IF(CPACK_RPM_PACKAGE_DEBUG)
      MESSAGE("CPackRPM:Debug: You may consult rpmbuild logs in: ")