From 0345bf0b747e2a5a770c5cffad20639b0f76dfbc Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 13 Nov 2021 09:00:54 +0100
Subject: [PATCH] Adapt dist RPMs to new approach.

---
 dist/argeo-cli/pom.xml  | 2 ++
 dist/argeo-node/pom.xml | 4 +++-
 dist/osgi-boot/pom.xml  | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml
index 2efaf760c..77538ecc2 100644
--- a/dist/argeo-cli/pom.xml
+++ b/dist/argeo-cli/pom.xml
@@ -68,6 +68,8 @@
 								</goals>
 								<configuration>
 									<name>argeo-cli${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/etc/argeo-cli</directory>
diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 612611023..d9a29c85a 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -41,7 +41,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-assembly-plugin</artifactId>
 						<configuration>
-							<finalName>argeo-node-${project.version}</finalName>
+							<finalName>argeo-node-${version.released}${buildId}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>
 								<descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -76,6 +76,8 @@
 								</goals>
 								<configuration>
 									<name>argeo-node${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/etc/argeo</directory>
diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 2eb7513d6..abd336581 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -70,6 +70,8 @@
 								</goals>
 								<configuration>
 									<name>argeo-osgi-boot${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
-- 
2.30.2