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

[cmake-commits at cmake.org]

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

Modified Files:
	CPackRPM.cmake 
Log Message:
CPackRPM:: add support for USER specified post/pre [un]install scripts (fix bug 8988)

Eric


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** CPackRPM.cmake	11 Nov 2009 20:27:44 -0000	1.17
--- CPackRPM.cmake	11 Nov 2009 20:55:44 -0000	1.18
***************
*** 45,49 ****
  #  CPACK_RPM_PACKAGE_VENDOR 
  #     Mandatory : YES
! #     Default   : CPACK_PACKAGE_VENDOR if set or"unknown"
  #     The RPM package group.
  #  CPACK_RPM_PACKAGE_DESCRIPTION
--- 45,49 ----
  #  CPACK_RPM_PACKAGE_VENDOR 
  #     Mandatory : YES
! #     Default   : CPACK_PACKAGE_VENDOR if set or "unknown"
  #     The RPM package group.
  #  CPACK_RPM_PACKAGE_DESCRIPTION
***************
*** 88,91 ****
--- 88,109 ----
  #     The user may then use this file in order to hand-craft is own
  #     binary spec file which may be used with CPACK_RPM_USER_BINARY_SPECFILE.
+ #  CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
+ #  CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
+ #     Mandatory : NO
+ #     Default   : -
+ #     May be used to embbed a pre (un)installation script in the spec file.
+ #     The refered script file(s) will be read and directly
+ #     put after the %pre or %preun section
+ #     One may verify which scriptlet has been included with
+ #      rpm -qp --scripts  package.rpm
+ #  CPACK_RPM_POST_INSTALL_SCRIPT_FILE
+ #  CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
+ #     Mandatory : NO
+ #     Default   : -
+ #     May be used to embbed a post (un)installation script in the spec file.
+ #     The refered script file(s) will be read and directly
+ #     put after the %post or %postun section
+ #     One may verify which scriptlet has been included with
+ #      rpm -qp --scripts  package.rpm
  
  #=============================================================================
***************
*** 276,279 ****
--- 294,339 ----
  ENDIF(CPACK_RPM_SPEC_INSTALL_POST)
  
+ # CPACK_RPM_POST_INSTALL_SCRIPT_FILE
+ # CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
+ # May be used to embbed a post (un)installation script in the spec file.
+ # The refered script file(s) will be read and directly
+ # put after the %post or %postun section
+ if(CPACK_RPM_POST_INSTALL_SCRIPT_FILE)
+   if(EXISTS ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE})
+     file(READ ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_POSTINSTALL)
+   else(EXISTS ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE})
+     message("CPackRPM:Warning: CPACK_RPM_POST_INSTALL_SCRIPT_FILE <${CPACK_RPM_POST_INSTALL_SCRIPT_FILE}> does not exists - ignoring")
+   endif(EXISTS ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_POST_INSTALL_SCRIPT_FILE)
+ 
+ if(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE)
+   if(EXISTS ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE})
+     file(READ ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_POSTUNINSTALL)
+   else(EXISTS ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE})
+     message("CPackRPM:Warning: CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE <${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE}> does not exists - ignoring")
+   endif(EXISTS ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE)
+ 
+ # CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
+ # CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
+ # May be used to embbed a pre (un)installation script in the spec file.
+ # The refered script file(s) will be read and directly
+ # put after the %pre or %preun section
+ if(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE)
+   if(EXISTS ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE})
+     file(READ ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_PREINSTALL)
+   else(EXISTS ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE})
+     message("CPackRPM:Warning: CPACK_RPM_PRE_INSTALL_SCRIPT_FILE <${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE}> does not exists - ignoring")
+   endif(EXISTS ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE)
+ 
+ if(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE)
+   if(EXISTS ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE})
+     file(READ ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE} CPACK_RPM_SPEC_PREUNINSTALL)
+   else(EXISTS ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE})
+     message("CPackRPM:Warning: CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE <${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE}> does not exists - ignoring")
+   endif(EXISTS ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE})
+ endif(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE)
+ 
  # CPACK_RPM_SPEC_MORE_DEFINE
  # This is a generated spec rpm file spaceholder
***************
*** 370,373 ****
--- 430,445 ----
  %clean
  
+ %post
+ \@CPACK_RPM_SPEC_POSTINSTALL\@
+ 
+ %postun
+ \@CPACK_RPM_SPEC_POSTUNINSTALL\@
+ 
+ %pre
+ \@CPACK_RPM_SPEC_PREINSTALL\@
+ 
+ %preun
+ \@CPACK_RPM_SPEC_PREUNINSTALL\@
+ 
  %files
  %defattr(-,root,root,-)