[Cmake-commits] [cmake-commits] eric.noulard committed CPackRPM.cmake 1.20 1.21

[cmake-commits at cmake.org]

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

Modified Files:
	CPackRPM.cmake 
Log Message:
CPackRPM:: Fix bug on Open SuSE 11.2 coming from initial fix of bug8972  

Eric


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** CPackRPM.cmake	22 Nov 2009 17:52:47 -0000	1.20
--- CPackRPM.cmake	28 Nov 2009 14:57:59 -0000	1.21
***************
*** 5,9 ****
  #
  # However CPackRPM has specific features which are controlled by
! # the specifics CPACK_RPM_XXX variables.You'll find a detailed usage on 
  # the wiki: 
  #  http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29
--- 5,9 ----
  #
  # However CPackRPM has specific features which are controlled by
! # the specifics CPACK_RPM_XXX variables. You'll find a detailed usage on 
  # the wiki: 
  #  http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29
***************
*** 54,57 ****
--- 54,60 ----
  #     Default   : -
  #     May be used to set RPM dependencies (requires).
+ #     Note that you must enclose the complete requires string between quotes, 
+ #     for example:
+ #     set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.5.0, cmake >= 2.8")
  #  CPACK_RPM_PACKAGES_PROVIDES
  #     Mandatory : NO
***************
*** 366,374 ****
  # We should not forget to include symlinks (thus -o -type l)
  # We must remove the './' due to the local search (thus the sed)
  EXECUTE_PROCESS(COMMAND find -type f -o -type l
                 COMMAND sed {s/\\.//}
                 WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
                 OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
!                               
  # The name of the final spec file to be used by rpmbuild
  SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec")
--- 369,380 ----
  # We should not forget to include symlinks (thus -o -type l)
  # We must remove the './' due to the local search (thus the sed)
+ # Then we must authorize any man pages extension (adding * at the end)
+ # because rpmbuild may automatically compress those files
  EXECUTE_PROCESS(COMMAND find -type f -o -type l
                 COMMAND sed {s/\\.//}
+                COMMAND sed {s/.*man.*\\/.*/&*/}
                 WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
                 OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
! 
  # The name of the final spec file to be used by rpmbuild
  SET(CPACK_RPM_BINARY_SPECFILE "${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}.spec")
***************
*** 425,432 ****
  mv $RPM_BUILD_ROOT \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot
  
! %build
! mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT 
    
! #p install
  
  %clean
--- 431,443 ----
  mv $RPM_BUILD_ROOT \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot
  
! #p build
    
! %install
! if [ -e $RPM_BUILD_ROOT ];
! then
!   mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/* $RPM_BUILD_ROOT 
! else
!   mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT 
! fi 
  
  %clean
***************
*** 449,452 ****
--- 460,465 ----
  
  %changelog
+ * Sat Nov 28 2009 Erk <eric.noulard at gmail.com>
+   Refix backup/restore install tree for OpenSuSE 11.2
  * Sun Nov 22 2009 Erk <eric.noulard at gmail.com>
    Include symlinks in the file list.