From c4bcb20c70cc5a087881837473ab769554c8918e Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Thu, 16 Jan 2020 00:39:01 -0800 Subject: [PATCH] Add an optional release version suffix to RPM templates We can use this RPM macro to optionally append a build stamp to the release version at build time. This is necessary to achieve the same non-abi-compatible scheme as is used in the ROS debian packages. --- bloom/generators/rpm/templates/ament_cmake/template.spec.em | 2 +- bloom/generators/rpm/templates/ament_python/template.spec.em | 2 +- bloom/generators/rpm/templates/catkin/template.spec.em | 2 +- bloom/generators/rpm/templates/cmake/template.spec.em | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bloom/generators/rpm/templates/ament_cmake/template.spec.em b/bloom/generators/rpm/templates/ament_cmake/template.spec.em index 6bebfdfc..bed28e00 100644 --- a/bloom/generators/rpm/templates/ament_cmake/template.spec.em +++ b/bloom/generators/rpm/templates/ament_cmake/template.spec.em @@ -4,7 +4,7 @@ Name: @(Package) Version: @(Version) -Release: @(RPMInc)%{?dist} +Release: @(RPMInc)%{?dist}%{?release_suffix} Summary: ROS @(Name) package License: @(License) diff --git a/bloom/generators/rpm/templates/ament_python/template.spec.em b/bloom/generators/rpm/templates/ament_python/template.spec.em index 08855df0..08e07164 100644 --- a/bloom/generators/rpm/templates/ament_python/template.spec.em +++ b/bloom/generators/rpm/templates/ament_python/template.spec.em @@ -4,7 +4,7 @@ Name: @(Package) Version: @(Version) -Release: @(RPMInc)%{?dist} +Release: @(RPMInc)%{?dist}%{?release_suffix} Summary: ROS @(Name) package License: @(License) diff --git a/bloom/generators/rpm/templates/catkin/template.spec.em b/bloom/generators/rpm/templates/catkin/template.spec.em index f669229c..ef55be84 100644 --- a/bloom/generators/rpm/templates/catkin/template.spec.em +++ b/bloom/generators/rpm/templates/catkin/template.spec.em @@ -4,7 +4,7 @@ Name: @(Package) Version: @(Version) -Release: @(RPMInc)%{?dist} +Release: @(RPMInc)%{?dist}%{?release_suffix} Summary: ROS @(Name) package License: @(License) diff --git a/bloom/generators/rpm/templates/cmake/template.spec.em b/bloom/generators/rpm/templates/cmake/template.spec.em index f669229c..ef55be84 100644 --- a/bloom/generators/rpm/templates/cmake/template.spec.em +++ b/bloom/generators/rpm/templates/cmake/template.spec.em @@ -4,7 +4,7 @@ Name: @(Package) Version: @(Version) -Release: @(RPMInc)%{?dist} +Release: @(RPMInc)%{?dist}%{?release_suffix} Summary: ROS @(Name) package License: @(License)