From 12ad0f8de34bc5dadad025f70a488f9ed913896b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 13 Nov 2021 08:33:50 +0100
Subject: [PATCH] Make Maven RPM build easier to configure.

---
 cnf/unstable.bnd                     |  2 ++
 dep/org.argeo.dep.cms.client/pom.xml | 10 ++++++----
 dep/org.argeo.dep.cms.e4.rap/pom.xml | 12 +++++++-----
 dep/org.argeo.dep.cms.ext/pom.xml    |  4 ++--
 dep/org.argeo.dep.cms.node/pom.xml   | 10 ++++++----
 dep/org.argeo.dep.cms.ui.rap/pom.xml |  8 +++++---
 dist/argeo-cli/pom.xml               |  2 +-
 dist/argeo-node/pom.xml              |  6 +++---
 dist/osgi-boot/pom.xml               |  6 +++---
 pom.xml                              |  1 -
 10 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
index db4fe1b08..e58775d96 100644
--- a/cnf/unstable.bnd
+++ b/cnf/unstable.bnd
@@ -1,4 +1,6 @@
 category=org.argeo.commons
 version.released=2.3.1
 Bundle-RequiredExecutionEnvironment=JavaSE-11
+
 argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
+argeo.rpm.suffix=-unstable
diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 54ed0595f..ffa77ff22 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -272,7 +272,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-client-unstable</name>
+									<name>argeo-cms-client${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -291,8 +293,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-client-tp-unstable</require>
-										<require>argeo-osgi-boot-unstable</require>
+										<require>argeo-cms-client-tp${argeo.rpm.suffix}</require>
+										<require>argeo-osgi-boot${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -333,7 +335,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-client-tp-unstable</name>
+									<name>argeo-cms-client-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${maven.build.timestamp}</release>
 									<mappings>
diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 508c8b803..fe51ae9fd 100644
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -296,7 +296,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-e4-rap-unstable</name>
+									<name>argeo-cms-e4-rap${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -315,8 +317,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-ui-rap-unstable</require>
-										<require>argeo-cms-e4-rap-tp-unstable</require>
+										<require>argeo-cms-ui-rap${argeo.rpm.suffix}</require>
+										<require>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -357,7 +359,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-e4-rap-tp-unstable</name>
+									<name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${maven.build.timestamp}</release>
 									<mappings>
@@ -378,7 +380,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-ui-rap-tp-unstable</require>
+										<require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/org.argeo.dep.cms.ext/pom.xml b/dep/org.argeo.dep.cms.ext/pom.xml
index 61450aefa..d79060664 100644
--- a/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@ -112,7 +112,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-ext-tp-unstable</name>
+									<name>argeo-cms-ext-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${maven.build.timestamp}</release>
 									<mappings>
@@ -133,7 +133,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node-tp-unstable</require>
+										<require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index a1bbbca1e..bba426898 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -240,7 +240,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-node-unstable</name>
+									<name>argeo-cms-node${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -259,8 +261,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-client-unstable</require>
-										<require>argeo-cms-node-tp-unstable</require>
+										<require>argeo-cms-client${argeo.rpm.suffix}</require>
+										<require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -322,7 +324,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-client-tp-unstable</require>
+										<require>argeo-cms-client-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index e29aadf30..81e7ba438 100644
--- a/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@ -120,7 +120,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-ui-rap-unstable</name>
+									<name>argeo-cms-ui-rap${argeo.rpm.suffix}</name>
+									<projversion>${version.released}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -181,7 +183,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-ui-rap-tp-unstable</name>
+									<name>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${maven.build.timestamp}</release>
 									<mappings>
@@ -202,7 +204,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node-tp-unstable</require>
+										<require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml
index a4b6c07cb..2efaf760c 100644
--- a/dist/argeo-cli/pom.xml
+++ b/dist/argeo-cli/pom.xml
@@ -67,7 +67,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cli-unstable</name>
+									<name>argeo-cli${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/etc/argeo-cli</directory>
diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 9575a73f7..612611023 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -75,7 +75,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-node-unstable</name>
+									<name>argeo-node${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/etc/argeo</directory>
@@ -182,8 +182,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node-unstable</require>
-										<require>argeo-osgi-boot-unstable</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-osgi-boot${argeo.rpm.suffix}</require>
 										<!-- do not explicitely require java -->
 									</requires>
 								</configuration>
diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index c86ff6c91..2eb7513d6 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -69,7 +69,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-osgi-boot-unstable</name>
+									<name>argeo-osgi-boot${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -117,7 +117,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-osgi-boot-equinox-unstable</require>
+										<require>argeo-osgi-boot-equinox${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -141,7 +141,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-osgi-boot-equinox-unstable</name>
+									<name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${maven.build.timestamp}</release>
 									<mappings>
diff --git a/pom.xml b/pom.xml
index 42b0e1fa9..0acc28edf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,6 @@
 	<url>http://www.argeo.org/</url>
 	<properties>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
-		<!-- RPM -->
 		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
-- 
2.30.2