From 2e3d792180b262b18dbb12de065fe298c40b0fbb Mon Sep 17 00:00:00 2001
From: Tomas Repik <trepik@redhat.com>
Date: Jun 22 2017 10:11:02 +0000
Subject: add missing apache-commons-collections dependency

add metrics-reporter-config to the classpath of the server

---

diff --git a/cassandra-3.9-scripts.patch b/cassandra-3.9-scripts.patch
index a5811df..b90dc1c 100644
--- a/cassandra-3.9-scripts.patch
+++ b/cassandra-3.9-scripts.patch
@@ -108,7 +108,7 @@ diff -urN cassandra-3.9/bin/cassandra.in.sh cassandra-3.9new/bin/cassandra.in.sh
 -for jar in "$CASSANDRA_HOME"/lib/*.jar; do
 -    CLASSPATH="$CLASSPATH:$jar"
 -done
-+DEPS=( cassandra/cassandra-all metrics slf4j/api guava snakeyaml commons-codec jackson/jackson-mapper-asl jackson/jackson-core-asl netty/netty-all lz4 logback/logback-classic logback/logback-core jna sigar high-scale-lib/high-scale-lib antlr3-runtime concurrentlinkedhashmap-lru commons-lang3 json_simple stream-lib caffeine snappy-java jBCrypt jctools )
++DEPS=( cassandra/cassandra-all metrics slf4j/api guava snakeyaml commons-codec jackson/jackson-mapper-asl jackson/jackson-core-asl netty/netty-all lz4 logback/logback-classic logback/logback-core jna sigar high-scale-lib/high-scale-lib antlr3-runtime concurrentlinkedhashmap-lru commons-lang3 json_simple stream-lib caffeine snappy-java jBCrypt jctools metrics-reporter-config )
  
 -# JSR223 - collect all JSR223 engines' jars
 -for jsr223jar in "$CASSANDRA_HOME"/lib/jsr223/*/*.jar; do
diff --git a/cassandra.spec b/cassandra.spec
index 2e1b562..7a43c3c 100644
--- a/cassandra.spec
+++ b/cassandra.spec
@@ -10,7 +10,7 @@
 
 Name:		%{?scl_prefix}cassandra
 Version:	3.9
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Client utilities for %{pkg_name}
 # Apache (v2.0) BSD (3 clause):
 # ./src/java/org/apache/cassandra/utils/vint/VIntCoding.java
@@ -89,6 +89,10 @@ BuildRequires:	%{?scl_prefix}caffeine
 BuildRequires:	%{?scl_prefix}hppc
 BuildRequires:	%{?scl_prefix}lz4-java
 BuildRequires:	%{?scl_prefix}snappy-java
+BuildRequires:	%{?scl_prefix}cassandra-java-driver
+BuildRequires:	%{?scl_prefix}ohc
+BuildRequires:	%{?scl_prefix}ohc-core-j8
+BuildRequires:	%{?scl_prefix_java_common}apache-commons-collections
 # using high-scale-lib from stephenc, no Cassandra original
 #BuildRequires:	 mvn(com.boundary:high-scale-lib)
 BuildRequires:	%{?scl_prefix}high-scale-lib
@@ -107,10 +111,6 @@ BuildRequires:	%{?scl_prefix_java_common}jcl-over-slf4j
 BuildRequires:	%{?scl_prefix_java_common}ant-junit
 # in rh-java-common: 4.0.28, needed: 4.0.39.Final
 BuildRequires:	%{?scl_prefix_java_common}netty
-# TODO
-BuildRequires:	%{?scl_prefix}cassandra-java-driver
-BuildRequires:	%{?scl_prefix}ohc
-BuildRequires:	%{?scl_prefix}ohc-core-j8
 # the SCL version of the package depends on rh-maven33 collection
 %{?scl:Requires: %%scl_require rh-maven33}
 
@@ -357,6 +357,7 @@ install -p -D -m 644 conf/jvm.options %{buildroot}%{_sysconfdir}/%{pkg_name}/jvm
 install -p -D -m 644 conf/logback-tools.xml %{buildroot}%{_sysconfdir}/%{pkg_name}/logback-tools.xml
 install -p -D -m 644 conf/logback.xml %{buildroot}%{_sysconfdir}/%{pkg_name}/logback.xml
 install -p -D -m 644 conf/metrics-reporter-config-sample.yaml %{buildroot}%{_sysconfdir}/%{pkg_name}/metrics-reporter-config-sample.yaml
+install -p -D -m 440 conf/cqlshrc.sample %{buildroot}%{_sharedstatedir}/%{pkg_name}/.%{pkg_name}/cqlshrc
 install -p -D -m 755 bin/cqlsh.py %{buildroot}%{_bindir}/cqlsh
 install -p -D -m 755 bin/nodetool %{buildroot}%{_bindir}/nodetool
 install -p -D -m 755 bin/sstableloader %{buildroot}%{_bindir}/sstableloader
@@ -419,6 +420,7 @@ exit 0
 %attr(755, root, root) %{_bindir}/sstablesplit
 %attr(755, root, root) %{_bindir}/cqlsh
 %{_datadir}/%{pkg_name}/nodetool.in.sh
+%config(noreplace) %attr(440, %{pkg_name}, %{pkg_name}) %{_sharedstatedir}/%{pkg_name}/.%{pkg_name}/cqlshrc
 
 %files java-libs -f .mfiles
 %license LICENSE.txt NOTICE.txt
@@ -463,6 +465,10 @@ exit 0
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Jun 22 2017 Tomas Repik <trepik@redhat.com> - 3.9-9
+- add missing apache-commons-collections dependency
+- add metrics-reporter-config to the classpath of the server
+
 * Mon Apr 03 2017 Tomas Repik <trepik@redhat.com> - 3.9-8
 - add SchemaConstants.java and fix cassandra startup