[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36601] trunk/blender/build_files: patch from Dan Eicher for cpack rpms

[Campbell Barton]

Revision: 36601
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36601
Author:   campbellbarton
Date:     2011-05-10 21:59:11 +0000 (Tue, 10 May 2011)
Log Message:
-----------
patch from Dan Eicher for cpack rpms

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-05-10 17:26:37 UTC (rev 36600)
+++ trunk/blender/build_files/cmake/packaging.cmake	2011-05-10 21:59:11 UTC (rev 36601)
@@ -38,7 +38,7 @@
 	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")

Modified: trunk/blender/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- trunk/blender/build_files/package_spec/rpm/blender.spec.in	2011-05-10 17:26:37 UTC (rev 36600)
+++ trunk/blender/build_files/package_spec/rpm/blender.spec.in	2011-05-10 21:59:11 UTC (rev 36601)
@@ -5,7 +5,7 @@
 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@