part of a patch from Dan Eicher for cmake packaging.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 24 Aug 2011 18:23:21 +0000 (18:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 24 Aug 2011 18:23:21 +0000 (18:23 +0000)
build_files/cmake/packaging.cmake
build_files/package_spec/rpm/blender.spec.in

index 6cda62b..c0124fe 100644 (file)
@@ -43,7 +43,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
                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 @@ endmacro()
 
 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()
 
index 502e9f3..25ad534 100644 (file)
@@ -9,6 +9,7 @@ Release:        @CPACK_RPM_PACKAGE_RELEASE@%{?dist}
 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@