From 1551fd2fcd0c41409a26f5c8c32c25d99e059eb4 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 29 May 2013 06:39:44 +0000
Subject: [PATCH] OPENDJ-946 Package build fails when special chars are contained in the VERSION_QUALIFIER. - The packages name for Deb/RPM follows the rules given by their respective documentation. - Adding a VERSION_QUALIFIER containing special chars no longer make fail the package build.
---
opends/src/build-tools/org/opends/build/tools/GenerateRpm.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java b/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
index 335df83..80d84ac 100644
--- a/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
+++ b/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
@@ -225,6 +225,11 @@
sb.append("# Application Version" + EOL);
sb.append("Version: " + version + EOL);
sb.append("# Packaging Revision" + EOL);
+ // If VERSION_QUALIFIER is empty, need to remove '.' char.
+ if (release.endsWith("."))
+ {
+ release = release.substring(0, release.length() - 1);
+ }
sb.append("Release: " + release + EOL);
sb.append("# Software Licenced Under" + EOL);
sb.append("License: CDDL" + EOL);
--
Gitblit v1.10.0