[Cmake-commits] [cmake-commits] alex committed CPackRPM.cmake 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	CPackRPM.cmake 
Log Message:
BUG: fix #9031: newer rpm versions complain about the "#%" lines

Alex


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** CPackRPM.cmake	14 May 2009 19:31:18 -0000	1.12
--- CPackRPM.cmake	29 May 2009 20:09:56 -0000	1.13
***************
*** 299,303 ****
  ${TMP_RPM_BUILDARCH}
  
! #%define prefix ${CMAKE_INSTALL_PREFIX}
  %define _rpmdir ${CPACK_RPM_DIRECTORY}
  %define _rpmfilename ${CPACK_RPM_FILE_NAME}
--- 299,303 ----
  ${TMP_RPM_BUILDARCH}
  
! #p define prefix ${CMAKE_INSTALL_PREFIX}
  %define _rpmdir ${CPACK_RPM_DIRECTORY}
  %define _rpmfilename ${CPACK_RPM_FILE_NAME}
***************
*** 314,322 ****
  # we skip the _prepn _build and _install
  # steps because CPack does that for us
! #%prep
  
! #%build
    
! #%install
  
  %clean
--- 314,322 ----
  # we skip the _prepn _build and _install
  # steps because CPack does that for us
! #p prep
  
! #p build
    
! #p install
  
  %clean
***************
*** 324,329 ****
  %files
  %defattr(-,root,root,-)
! #%dir %{prefix}
! #%{prefix}/*
  /*
  
--- 324,329 ----
  %files
  %defattr(-,root,root,-)
! #p dir %{prefix}
! #p {prefix}/*
  /*