Revision: 39680
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39680
Author: campbellbarton
Date: 2011-08-24 18:23:21 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
part of a patch from Dan Eicher for cmake packaging.
Modified Paths:
--------------
trunk/blender/build_files/cmake/packaging.cmake
trunk/blender/build_files/package_spec/rpm/blender.spec.in
Modified: trunk/blender/build_files/cmake/packaging.cmake
===================================================================
--- trunk/blender/build_files/cmake/packaging.cmake 2011-08-24 18:13:11 UTC
(rev 39679)
+++ trunk/blender/build_files/cmake/packaging.cmake 2011-08-24 18:23:21 UTC
(rev 39680)
@@ -43,7 +43,7 @@
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_PACKAGE_GROUP "Amusements/Multimedia")
set(CPACK_RPM_USER_BINARY_SPECFILE
"${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in")
endif()
endif()
@@ -75,14 +75,14 @@
if(APPLE)
add_package_archive(
-
"blender-${BLENDER_VERSION}-r${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
+
"${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
"zip")
elseif(UNIX)
# platform name could be tweaked, to include glibc, and ensure
processor is correct (i386 vs i686)
string(TOLOWER ${CMAKE_SYSTEM_NAME} PACKAGE_SYSTEM_NAME)
add_package_archive(
-
"blender-${BLENDER_VERSION}-r${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
+
"${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
"tar.bz2")
endif()
Modified: trunk/blender/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- trunk/blender/build_files/package_spec/rpm/blender.spec.in 2011-08-24
18:13:11 UTC (rev 39679)
+++ trunk/blender/build_files/package_spec/rpm/blender.spec.in 2011-08-24
18:23:21 UTC (rev 39680)
@@ -9,6 +9,7 @@
License: @CPACK_RPM_PACKAGE_LICENSE@
Group: @CPACK_RPM_PACKAGE_GROUP@
Vendor: @CPACK_RPM_PACKAGE_VENDOR@
+Epoch: 1
%define _rpmdir @CPACK_RPM_DIRECTORY@
%define _rpmfilename @CPACK_RPM_FILE_NAME@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
