[Cmake-commits] [cmake-commits] eric.noulard committed CPackRPM.cmake 1.18 1.19

[cmake-commits at cmake.org]

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

Modified Files:
	CPackRPM.cmake 
Log Message:
CPackRPM: tolerate redhat specific clean BUILD ROOT pre-build macro (bug 9872)

Eric


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** CPackRPM.cmake	11 Nov 2009 20:55:44 -0000	1.18
--- CPackRPM.cmake	15 Nov 2009 18:55:42 -0000	1.19
***************
*** 416,428 ****
  \@CPACK_RPM_PACKAGE_DESCRIPTION\@
  
! # This is a shortcutted spec file
! # generated by CMake RPM generator
! # 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
  
! #p build
    
  #p install
--- 416,428 ----
  \@CPACK_RPM_PACKAGE_DESCRIPTION\@
  
! # This is a shortcutted spec file generated by CMake RPM generator
! # we skip _install step because CPack does that for us.
! # We do only save CPack installed tree in _prepr
! # and then restore it in build.
! %prep
! mv $RPM_BUILD_ROOT \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot
  
! %build
! mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT 
    
  #p install
***************
*** 444,452 ****
  %files
  %defattr(-,root,root,-)
- #p dir %{prefix}
- #p {prefix}/*
  ${CPACK_RPM_INSTALL_FILES}
  
  %changelog
  * Wed Oct 07 2009 Erk <eric.noulard at gmail.com>
    Add user custom spec file support 
--- 444,456 ----
  %files
  %defattr(-,root,root,-)
  ${CPACK_RPM_INSTALL_FILES}
  
  %changelog
+ * Sat Nov 14 2009 Erk <eric.noulard at gmail.com>
+   Replace prep and build step with backup and restore
+   of the previously CPack installed tree. This should
+   mimic what is expected in rpmbuild usual steps
+ * Wed Nov 11 2009 Erk <eric.noulard at gmail.com>
+   Add support for USER defined pre/post[un]install scripts
  * Wed Oct 07 2009 Erk <eric.noulard at gmail.com>
    Add user custom spec file support