[Cmake-commits] [cmake-commits] eric.noulard committed CPackRPM.cmake 1.14 1.15

[cmake-commits at cmake.org]

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

Modified Files:
	CPackRPM.cmake 
Log Message:
Fix CPack bug #9654

Eric


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** CPackRPM.cmake	28 Sep 2009 15:46:50 -0000	1.14
--- CPackRPM.cmake	9 Nov 2009 19:06:36 -0000	1.15
***************
*** 278,283 ****
  #STRING(REGEX REPLACE " " "\\\\ " CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
  SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
-   
  
  SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec")
  IF(CPACK_RPM_USER_BINARY_SPECFILE)
--- 278,288 ----
  #STRING(REGEX REPLACE " " "\\\\ " CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
  SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
  
+ # Use files tree to construct files command (spec file)
+ EXECUTE_PROCESS(COMMAND find -type f
+                COMMAND sed {s/\\.//}
+                WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
+                OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
+  
  SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec")
  IF(CPACK_RPM_USER_BINARY_SPECFILE)
***************
*** 327,330 ****
--- 332,337 ----
  # we skip the _prepn _build and _install
  # steps because CPack does that for us
+ # WE MUST NOT DO ANYTHING in those steps because they
+ # may fail for non-privileged user
  #p prep
  
***************
*** 339,345 ****
  #p dir %{prefix}
  #p {prefix}/*
! /*
  
  %changelog
  * Mon Oct 03 2008 Erk <eric.noulard at gmail.com>
    Update generator to handle optional dependencies using Requires
--- 346,354 ----
  #p dir %{prefix}
  #p {prefix}/*
! ${CPACK_RPM_INSTALL_FILES}
  
  %changelog
+ * Sat Oct 03 2009 Kami <cmoidavid at gmail.com>
+   Update to handle more precisely the files section
  * Mon Oct 03 2008 Erk <eric.noulard at gmail.com>
    Update generator to handle optional dependencies using Requires