From: Mateusz Korniak <matkor@pld-linux.org>
Date: Wed, 19 Oct 2011 14:37:49 +0000 (+0000)
Subject: - Release 1.
X-Git-Tag: auto/th/cassandra-bin-0_8_7-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcassandra-bin.git;a=commitdiff_plain;h=40af29a9503d9f3bb46bc49d1f76c538775a91f4

- Release 1.

Changed files:
    cassandra-bin-jamm_path_fix.patch -> 1.1
    cassandra-bin.spec -> 1.19
---

diff --git a/cassandra-bin-jamm_path_fix.patch b/cassandra-bin-jamm_path_fix.patch
new file mode 100644
index 0000000..4e4d0e6
--- /dev/null
+++ b/cassandra-bin-jamm_path_fix.patch
@@ -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
diff --git a/cassandra-bin.spec b/cassandra-bin.spec
index b001cf1..69d208b 100644
--- a/cassandra-bin.spec
+++ b/cassandra-bin.spec
@@ -11,7 +11,7 @@ Summary:	Cassandra database binary package
 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
@@ -19,6 +19,7 @@ Source0:	http://ftp.tpnet.pl/vol/d1/apache//cassandra/%{version}/apache-cassandr
 # 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
@@ -42,6 +43,7 @@ oparty na ColumnFamily, bogatszy niż typowe systemy klucza i wartości.
 
 %prep
 %setup -q -n apache-cassandra-%{version}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT