patch from Dan Eicher for cpack rpms

diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 07c5add52b007f69daecd8cda45a20a00ff0cc1f..6cda62b487fd69ab89849a51845aede5b790810a 100644 (file)
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -38,7 +38,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
        include(build_files/cmake/RpmBuild.cmake)
        if(RPMBUILD_FOUND AND NOT WIN32)
                set(CPACK_GENERATOR "RPM")
-               set(CPACK_RPM_PACKAGE_RELEASE "r${BUILD_REV}")
+               set(CPACK_RPM_PACKAGE_RELEASE "1.r${BUILD_REV}")
                set(CPACK_SET_DESTDIR "true")
                set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
                set(CPACK_PACKAGE_RELOCATABLE "false")

diff --git a/build_files/package_spec/rpm/blender.spec.in b/build_files/package_spec/rpm/blender.spec.in
index 32c9ef99820b4dcddb1dd85ae7e409a5d5b3aba9..502e9f36251ef40a4b1dac319c38f03798af4963 100644 (file)
--- a/build_files/package_spec/rpm/blender.spec.in
+++ b/build_files/package_spec/rpm/blender.spec.in
@@ -5,7 +5,7 @@ BuildRoot:      @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAG
 Summary:        @CPACK_RPM_PACKAGE_SUMMARY@
 Name:           @CPACK_RPM_PACKAGE_NAME@
 Version:        @CPACK_RPM_PACKAGE_VERSION@
-Release:        @CPACK_RPM_PACKAGE_RELEASE@
+Release:        @CPACK_RPM_PACKAGE_RELEASE@%{?dist}
 License:        @CPACK_RPM_PACKAGE_LICENSE@
 Group:          @CPACK_RPM_PACKAGE_GROUP@
 Vendor:         @CPACK_RPM_PACKAGE_VENDOR@