From 2e3538cf24e3ef22e834690cc49dbd531535e01c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 10 May 2011 21:59:11 +0000 Subject: [PATCH] patch from Dan Eicher for cpack rpms --- build_files/cmake/packaging.cmake | 2 +- build_files/package_spec/rpm/blender.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 07c5add52b0..6cda62b487f 100644 --- 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 32c9ef99820..502e9f36251 100644 --- 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@