packages: cassandra-bin/cassandra-bin.spec, cassandra-bin/cassandra-bin-jam...

[matkor]

Author: matkor                       Date: Wed Oct 19 14:37:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Release 1.

---- Files affected:
packages/cassandra-bin:
   cassandra-bin.spec (1.18 -> 1.19) , cassandra-bin-jamm_path_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cassandra-bin/cassandra-bin.spec
diff -u packages/cassandra-bin/cassandra-bin.spec:1.18 packages/cassandra-bin/cassandra-bin.spec:1.19
--- packages/cassandra-bin/cassandra-bin.spec:1.18	Wed Oct 19 15:05:15 2011
+++ packages/cassandra-bin/cassandra-bin.spec	Wed Oct 19 16:37:49 2011
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Binarna redystrybucja bazy danych Cassandra
 Name:		cassandra-bin
 Version:	0.8.7
-Release:	0.1
+Release:	1
 License:	ASF
 Group:		Applications/Databases
 # http://www.apache.org/dyn/closer.cgi?path=/cassandra/0.8.7/apache-cassandra-0.8.7-bin.tar.gz
@@ -20,6 +20,7 @@
 # Source0-md5:	d951018abe20988a1947ba9d883a0080
 Source1:	cassandra.in.sh
 Source2:	%{shname}.init
+Patch0:		%{name}-jamm_path_fix.patch
 URL:		http://cassandra.apache.org/
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q -n apache-cassandra-%{version}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,8 +104,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.18  2011/10/19 13:05:15  matkor
-- Version 0.8.7-0.1
+Revision 1.19  2011/10/19 14:37:49  matkor
+- Release 1.
 
 Revision 1.17  2011/09/07 18:08:21  gotar
 - cosmetics: %install syntax (removed %_javadir, kept still unpackaged

================================================================
Index: packages/cassandra-bin/cassandra-bin-jamm_path_fix.patch
diff -u /dev/null packages/cassandra-bin/cassandra-bin-jamm_path_fix.patch:1.1
--- /dev/null	Wed Oct 19 16:37:54 2011
+++ packages/cassandra-bin/cassandra-bin-jamm_path_fix.patch	Wed Oct 19 16:37:49 2011
@@ -0,0 +1,11 @@
+--- ./conf/cassandra-env.sh.jamm_path_fix	2011-10-19 16:27:07.373001180 +0200
++++ ./conf/cassandra-env.sh	2011-10-19 16:27:30.366552514 +0200
+@@ -100,7 +100,7 @@ JVM_OPTS="$JVM_OPTS -ea"
+ check_openjdk=`"${JAVA:-java}" -version 2>&1 | awk '{if (NR == 2) {print $1}}'`
+ if [ "$check_openjdk" != "OpenJDK" ]
+ then
+-    JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.2.jar"
++    JVM_OPTS="$JVM_OPTS -javaagent:/usr/share/cassandra/jamm-0.2.2.jar"
+ fi
+ 
+ # enable thread priorities, primarily so we can give periodic tasks
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cassandra-bin/cassandra-bin.spec?r1=1.18&r2=1.19&f=u