This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new ec1808a Fixes version used inside the rpm package
ec1808a is described below
commit ec1808a34f9aa5ae0b956c1527828566f4ba2be5
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu May 28 20:14:14 2020 +0200
Fixes version used inside the rpm package
patch by Mick Semb Wever; reviewed by Benjamin Lerer for CASSANDRA-15830
---
CHANGES.txt | 1 +
redhat/cassandra.spec | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 7fbd0b4..3a58b05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0-alpha5
+ * Fix Cassandra restart from rpm install (CASSANDRA-15830)
* Improve handling of 2i initialization failures (CASSANDRA-13606)
* Add completion_ratio column to sstable_tasks virtual table (CASANDRA-15759)
* Add support for adding custom Verbs (CASSANDRA-15725)
diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec
index ca5d38e..9ca9f4c 100644
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@ -48,7 +48,7 @@ Cassandra is a distributed (peer-to-peer) system for the
management and storage
%build
export LANG=en_US.UTF-8
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
-ant clean jar -Dversion=%{version}
+ant clean jar -Dversion=%{upstream_version}
%install
%{__rm} -rf %{buildroot}
@@ -106,7 +106,7 @@ cp -p bin/* %{buildroot}/usr/bin/
cp -p tools/bin/* %{buildroot}/usr/bin/
# copy cassandra jar
-cp build/apache-cassandra-%{version}.jar %{buildroot}/usr/share/%{username}/
+cp build/apache-cassandra-%{upstream_version}.jar
%{buildroot}/usr/share/%{username}/
%clean
%{__rm} -rf %{buildroot}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
