[cassandra-builds] branch master updated: Replace '-' with '~' for CASSANDRA_VERSION in rpm build

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mshuler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git


The following commit(s) were added to refs/heads/master by this push:
     new 46764e5  Replace '-' with '~' for CASSANDRA_VERSION in rpm build
46764e5 is described below

commit 46764e56777f85a486877efb2ccc76550923a89a
Author: Michael Shuler <mi...@pbandjelly.org>
AuthorDate: Thu Sep 5 13:45:11 2019 -0700

    Replace '-' with '~' for CASSANDRA_VERSION in rpm build
---
 docker/build-rpms.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/build-rpms.sh b/docker/build-rpms.sh
index 15a2249..d2d7c17 100755
--- a/docker/build-rpms.sh
+++ b/docker/build-rpms.sh
@@ -69,5 +69,9 @@ mkdir -p ./build/javadoc
 # Artifact will only be used internally for build process and won't be found with snapshot suffix
 ant artifacts -Drelease=true
 cp ./build/apache-cassandra-*-src.tar.gz ${RPM_BUILD_DIR}/SOURCES/
+
+# if CASSANDRA_VERSION is -alphaN, -betaN, -rcN, then rpmbuild fails on the '-' char; replace with '~'
+CASSANDRA_VERSION=${CASSANDRA_VERSION/-/\~}
+
 rpmbuild --define="version ${CASSANDRA_VERSION}" --define="revision ${CASSANDRA_REVISION}" -ba ./redhat/cassandra.spec
 cp $RPM_BUILD_DIR/SRPMS/*.rpm $RPM_BUILD_DIR/RPMS/noarch/*.rpm $RPM_DIST_DIR


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org