upgrading package: cassandra 3.3 -> 3.4

cassandra/cassandra.patch

@@ -1,6 +1,6 @@
 Index: bin/cassandra.in.sh
---- bin/cassandra.in.sh.orig	2016-01-15 03:32:19.000000000 +0100
-+++ bin/cassandra.in.sh	2016-02-06 21:02:19.224686453 +0100
+--- bin/cassandra.in.sh.orig	2016-02-29 21:24:27.000000000 +0100
++++ bin/cassandra.in.sh	2016-04-05 23:04:16.967330025 +0200
 @@ -15,19 +15,19 @@
  # limitations under the License.
  
@@ -38,17 +38,22 @@ Index: bin/cassandra.in.sh
  done
  
 Index: bin/cqlsh
---- bin/cqlsh.orig	2016-01-15 03:32:19.000000000 +0100
-+++ bin/cqlsh	2016-02-06 21:02:19.224686453 +0100
-@@ -16,4 +16,4 @@
- # limitations under the License.
- 
- 
--python "`dirname "$0"`/cqlsh.py" "$@"
-+@l_prefix@/bin/python "`dirname "$0"`/cqlsh.py" "$@"
+--- bin/cqlsh.orig	2016-04-05 23:04:16.967330000 +0200
++++ bin/cqlsh	2016-04-05 23:05:00.697352417 +0200
+@@ -17,8 +17,8 @@
+ 
+ # bash code here; finds a suitable python interpreter and execs this file.
+ # prefer unqualified "python" if suitable:
+-python -c 'import sys; sys.exit(not (0x020700b0 < sys.hexversion < 0x03000000))' 2>/dev/null \
+-    && exec python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
++@l_prefix@/bin/python -c 'import sys; sys.exit(not (0x020700b0 < sys.hexversion < 0x03000000))' 2>/dev/null \
++    && exec @l_prefix@/bin/python "`python -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
+ for pyver in 2.7; do
+     which python$pyver > /dev/null 2>&1 && exec python$pyver "`python$pyver -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
+ done
 Index: cassandra-driver-3.1.1/setup.py
---- cassandra-driver-3.1.1/setup.py.orig	2015-11-23 21:56:03.000000000 +0100
-+++ cassandra-driver-3.1.1/setup.py	2016-02-06 21:02:19.224686453 +0100
+--- cassandra-driver-3.1.1/setup.py.orig	2016-03-10 22:43:43.000000000 +0100
++++ cassandra-driver-3.1.1/setup.py	2016-04-05 23:04:16.967330025 +0200
 @@ -146,9 +146,9 @@
  
  libev_ext = Extension('cassandra.io.libevwrapper',
@@ -62,9 +67,9 @@ Index: cassandra-driver-3.1.1/setup.py
  platform_unsupported_msg = \
  """
 Index: conf/cassandra-env.sh
---- conf/cassandra-env.sh.orig	2016-01-15 03:32:19.000000000 +0100
-+++ conf/cassandra-env.sh	2016-02-06 21:02:19.224686453 +0100
-@@ -204,7 +204,7 @@
+--- conf/cassandra-env.sh.orig	2016-02-29 21:24:27.000000000 +0100
++++ conf/cassandra-env.sh	2016-04-05 23:04:16.967330025 +0200
+@@ -207,7 +207,7 @@
  JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
  
  # add the jamm javaagent
@@ -74,8 +79,8 @@ Index: conf/cassandra-env.sh
  # set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR
  if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then
 Index: conf/cassandra.yaml
---- conf/cassandra.yaml.orig	2016-01-15 03:32:19.000000000 +0100
-+++ conf/cassandra.yaml	2016-02-06 21:03:34.985550822 +0100
+--- conf/cassandra.yaml.orig	2016-02-29 21:24:27.000000000 +0100
++++ conf/cassandra.yaml	2016-04-05 23:04:16.967330025 +0200
 @@ -69,6 +69,7 @@
  # Directory where Cassandra should store hints.
  # If not set, the default directory is $CASSANDRA_HOME/data/hints.
@@ -84,7 +89,7 @@ Index: conf/cassandra.yaml
  
  # How often hints should be flushed from the internal buffers to disk.
  # Will *not* trigger fsync.
-@@ -166,13 +167,13 @@
+@@ -185,13 +186,13 @@
  # will spread data evenly across them, subject to the granularity of
  # the configured compaction strategy.
  # If not set, the default directory is $CASSANDRA_HOME/data/data.
@@ -101,7 +106,7 @@ Index: conf/cassandra.yaml
  
  # policy for data disk failures:
  # die: shut down gossip and client transports and kill the JVM for any fs errors or
-@@ -284,7 +285,7 @@
+@@ -303,7 +304,7 @@
  
  # saved caches
  # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
@@ -111,8 +116,8 @@ Index: conf/cassandra.yaml
  # commitlog_sync may be either "periodic" or "batch." 
  # 
 Index: conf/logback.xml
---- conf/logback.xml.orig	2016-01-15 03:32:19.000000000 +0100
-+++ conf/logback.xml	2016-02-06 21:02:19.224686453 +0100
+--- conf/logback.xml.orig	2016-02-29 21:24:27.000000000 +0100
++++ conf/logback.xml	2016-04-05 23:04:16.967330025 +0200
 @@ -32,9 +32,9 @@
      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
        <level>INFO</level>

cassandra/cassandra.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_cassandra        3.3
+%define       V_cassandra        3.4
 %define       V_cassandra_driver 3.1.1
 
 #   package information
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Database
 License:      Apache
 Version:      %{V_cassandra}
-Release:      20160315
+Release:      20160405
 
 #   list of sources
 Source0:      http://www.apache.org/dist/cassandra/%{V_cassandra}/apache-cassandra-%{V_cassandra}-bin.tar.gz
@@ -65,7 +65,7 @@ PreReq:       libev
     prog cassandra:cassandra = {
         version   = %{V_cassandra}
         url       = http://cassandra.apache.org/download/
-        regex     = apache-cassandra-(\d+\.\d+\.\d+)-bin\.tar\.gz
+        regex     = apache-cassandra-(\d+\.\d+(?:\.\d+)*)-bin\.tar\.gz
     }
     prog cassandra:cassandra-driver = {
         version   = %{V_cassandra_driver}