diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 01:59:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 01:59:11 +0400 |
| commit | 2e3538cf24e3ef22e834690cc49dbd531535e01c (patch) | |
| tree | 9d619c29c48b79ec8308fd2f22042080bb4c8f73 /build_files | |
| parent | 0c990fba6e7be853d636bbf53135e6c0c9168eac (diff) | |
patch from Dan Eicher for cpack rpms
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/packaging.cmake | 2 | ||||
| -rw-r--r-- | 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@ |