---- ./conf/cassandra-env.sh.jamm_path_fix 2012-05-16 10:11:38.016189136 +0200
-+++ ./conf/cassandra-env.sh 2012-05-16 10:12:25.489984266 +0200
-@@ -121,7 +121,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.5.jar"
-+ JVM_OPTS="$JVM_OPTS -javaagent:/usr/share/cassandra/jamm-0.2.5.jar"
- fi
+--- ./conf/cassandra-env.sh.jamm_path_fix 2014-10-21 16:31:37.000000000 +0200
++++ ./conf/cassandra-env.sh 2015-01-12 21:31:40.086273885 +0100
+@@ -168,7 +168,7 @@ JMX_PORT="7199"
+ JVM_OPTS="$JVM_OPTS -ea"
- # enable thread priorities, primarily so we can give periodic tasks
+ # add the jamm javaagent
+-JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
++JVM_OPTS="$JVM_OPTS -javaagent:/usr/share/cassandra/jamm-0.2.5.jar"
+
+ # some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541
+ JVM_OPTS="$JVM_OPTS -XX:+CMSClassUnloadingEnabled"
Summary: Cassandra database binary package
Summary(pl.UTF-8): Binarna redystrybucja bazy danych Cassandra
Name: cassandra-bin
-Version: 2.0.6
+Version: 2.0.11
Release: 1
License: ASF
Group: Applications/Databases
Source0: ftp://ftp.task.gda.pl/pub/www/apache/dist/cassandra/%{version}/apache-cassandra-%{version}-bin.tar.gz
-# Source0-md5: c8da1f4f546ea31ab85cfb236374863b
+# Source0-md5: f8021f9defcdd6957ff78de7c6d5308b
Source1: cassandra.in.sh
Source2: %{shname}.init
Source3: %{name}.tmpfiles
Patch0: %{name}-jamm_path_fix.patch
+Patch1: %{name}-cqlsh_path_fix.patch
URL: http://cassandra.apache.org/
+BuildRequires: python-distribute
BuildRequires: rpm-javaprov
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires(post,preun): /sbin/chkconfig
+Requires: python-modules
Requires: rc-scripts
Suggests: java-jna
BuildArch: noarch
%prep
%setup -q -n apache-cassandra-%{version}
%patch0 -p1
+%patch1 -p1
+
+%build
+# current version of cqlsh supports only python 2.
+cd pylib
+%{__python} setup.py build --build-base build-2 %{?with_tests:test}
+cd ..
%install
rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_ROOT%{systemdtmpfilesdir}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/cassandra
-cp -p bin/{*sstable*,*tool,cassandra-cli} $RPM_BUILD_ROOT%{_bindir}
+
+rm bin/*.bat
+cp -p bin/{cqlsh,*sstable*,*tool,cassandra-cli} $RPM_BUILD_ROOT%{_bindir}
cp -p bin/cassandra $RPM_BUILD_ROOT%{_sbindir}
cp -p %{SOURCE1} lib/*.jar $RPM_BUILD_ROOT%{_datadir}/%{shname}
+# use bundled libs for python-cql - from cqlsh doc
+cp -p %{SOURCE1} lib/cql-internal-only-1.4.1.zip $RPM_BUILD_ROOT%{_datadir}/%{shname}
+cp -p %{SOURCE1} lib/thrift-python-internal-only-0.9.1.zip $RPM_BUILD_ROOT%{_datadir}/%{shname}
cp -p conf/{*.properties,cassandra-env.sh,cassandra.yaml,README.txt} $RPM_BUILD_ROOT/var/lib/%{shname}/conf
install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{shname}.conf
+cd pylib
+%{__python} setup.py \
+ build --build-base build-2 \
+ install --skip-build \
+ --optimize=2 \
+ --root=$RPM_BUILD_ROOT
+cd ..
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES.txt LICENSE.txt README.txt NEWS.txt NOTICE.txt
+%doc CHANGES.txt LICENSE.txt NEWS.txt NOTICE.txt
%attr(754,root,root) /etc/rc.d/init.d/cassandra
%attr(755,root,root) %{_bindir}/cassandra-cli
+%attr(755,root,root) %{_bindir}/cqlsh
%attr(755,root,root) %{_bindir}/nodetool
%attr(755,root,root) %{_bindir}/json2sstable
%attr(755,root,root) %{_bindir}/sstable2json
%attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.yaml
%attr(750,cassandra,cassandra) %dir /var/log/%{shname}
%attr(750,cassandra,cassandra) %dir /var/run/%{shname}
+%{py_sitescriptdir}/cqlshlib
+%if "%{py_ver}" > "2.4"
+ %{py_sitescriptdir}/cassandra_pylib-0.0.0-py*.egg-info
+%endif