[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36527] trunk/blender/build_files/cmake/ packaging.cmake: patch from Dan Eicher, CPack/RPM working again

[Campbell Barton]

Revision: 36527
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36527
Author:   campbellbarton
Date:     2011-05-06 23:59:15 +0000 (Fri, 06 May 2011)
Log Message:
-----------
patch from Dan Eicher, CPack/RPM working again

Modified Paths:
--------------
    trunk/blender/build_files/cmake/packaging.cmake

Modified: trunk/blender/build_files/cmake/packaging.cmake
===================================================================
--- trunk/blender/build_files/cmake/packaging.cmake	2011-05-06 23:54:40 UTC (rev 36526)
+++ trunk/blender/build_files/cmake/packaging.cmake	2011-05-06 23:59:15 UTC (rev 36527)
@@ -31,17 +31,20 @@
 
 
 # Force Package Name
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CPACK_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	# RPM packages
 	include(build_files/cmake/RpmBuild.cmake)
 	if(RPMBUILD_FOUND AND NOT WIN32)
 		set(CPACK_GENERATOR "RPM")
-		set(CPACK_SET_DESTDIR TRUE)
+		set(CPACK_RPM_PACKAGE_RELEASE "r${BUILD_REV}")
+		set(CPACK_SET_DESTDIR "true")
 		set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
+		set(CPACK_PACKAGE_RELOCATABLE "false")
 		set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 		set(CPACK_RPM_PACKAGE_GROUP "Amusements/Graphics")
+		set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/build_files/package_spec/blender.spec.in")
 	endif()
 endif()