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

[cmake-commits at cmake.org]

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

Modified Files:
	CPackRPM.cmake 
Log Message:
CPackRPM:: support user supplied "Provides" in spec file (fix bug 9584)

Eric


Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** CPackRPM.cmake	9 Nov 2009 21:17:22 -0000	1.16
--- CPackRPM.cmake	11 Nov 2009 20:27:44 -0000	1.17
***************
*** 53,57 ****
  #     Mandatory : NO
  #     Default   : -
! #     May be used to set RPM dependencies. 
  #  CPACK_RPM_SPEC_INSTALL_POST
  #     Mandatory : NO
--- 53,61 ----
  #     Mandatory : NO
  #     Default   : -
! #     May be used to set RPM dependencies (requires).
! #  CPACK_RPM_PACKAGES_PROVIDES
! #     Mandatory : NO
! #     Default   : -
! #     May be used to set RPM dependencies (provides).
  #  CPACK_RPM_SPEC_INSTALL_POST
  #     Mandatory : NO
***************
*** 251,254 ****
--- 255,268 ----
  ENDIF(CPACK_RPM_PACKAGE_REQUIRES)
  
+ # CPACK_RPM_PACKAGE_PROVIDES
+ # Placeholder used to specify binary RPM dependencies (if any)
+ # see http://www.rpm.org/max-rpm/s1-rpm-depend-manual-dependencies.html
+ IF(CPACK_RPM_PACKAGE_PROVIDES)
+   IF(CPACK_RPM_PACKAGE_DEBUG)
+     MESSAGE("CPackRPM:Debug: User defined Provides:\n ${CPACK_RPM_PACKAGE_PROVIDES}")
+   ENDIF(CPACK_RPM_PACKAGE_DEBUG)
+   SET(TMP_RPM_PROVIDES "Provides: ${CPACK_RPM_PACKAGE_PROVIDES}")
+ ENDIF(CPACK_RPM_PACKAGE_PROVIDES)
+ 
  # CPACK_RPM_SPEC_INSTALL_POST
  # May be used to define a RPM post intallation script
***************
*** 328,331 ****
--- 342,346 ----
  Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
  \@TMP_RPM_REQUIRES\@
+ \@TMP_RPM_PROVIDES\@
  \@TMP_RPM_BUILDARCH\@