Merge branch 'master' of git://git.pld-linux.org/packages/cassandra-bin

[packages/cassandra-bin.git] / cassandra-bin.spec

diff --git a/cassandra-bin.spec b/cassandra-bin.spec
index 30a56d21d205194e1026ef3d00029232f3a68f38..24239493a093df3b67dc657a0815b858c8e41626 100644 (file)
--- a/cassandra-bin.spec
+++ b/cassandra-bin.spec
@@ -10,17 +10,18 @@
 Summary:       Cassandra database binary package
 Summary(pl.UTF-8):     Binarna redystrybucja bazy danych Cassandra
 Name:          cassandra-bin
-Version:       2.0.17
-Release:       1
+Version:       2.1.11
+Release:       0.3
 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: 5c3a1dd76f5261900e3f165f3e964815
+# Source0-md5: 9f6c940e4201575804d07a2e103d1d61
 Source1:       cassandra.in.sh
 Source2:       %{shname}.init
 Source3:       %{name}.tmpfiles
 Patch0:                %{name}-jamm_path_fix.patch
 Patch1:                %{name}-cqlsh_path_fix.patch
+Patch2:                %{name}-pld_logging.patch
 URL:           http://cassandra.apache.org/
 BuildRequires: python-distribute
 BuildRequires: rpm-javaprov
@@ -50,6 +51,7 @@ oparty na ColumnFamily, bogatszy niż typowe systemy klucza i wartości.
 %setup -q -n apache-cassandra-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # current version of cqlsh supports only python 2.
@@ -70,10 +72,13 @@ 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.2.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
-
+# cp -p %{SOURCE1} lib/cql-internal-only-1.4.2.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 %{SOURCE1} lib/*.zip $RPM_BUILD_ROOT%{_datadir}/%{shname}
+cp -p conf/{*.properties,*.yaml,*.xml,cassandra-env.sh,hotspot_compiler,README.txt} $RPM_BUILD_ROOT/var/lib/%{shname}/conf
+# ,triggers
+install -d $RPM_BUILD_ROOT/var/lib/%{shname}/conf/triggers
+cp -p conf/triggers/*.txt  $RPM_BUILD_ROOT/var/lib/%{shname}/conf/triggers
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{shname}.conf
 
 cd pylib
@@ -104,12 +109,12 @@ fi
 %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(755,root,root) %{_bindir}/json2sstable
+## %attr(755,root,root) %{_bindir}/sstable2json
 %attr(755,root,root) %{_bindir}/sstablescrub
 %attr(755,root,root) %{_bindir}/sstablekeys
 %attr(755,root,root) %{_bindir}/sstableloader
-%attr(755,root,root) %{_bindir}/sstablesplit
+## %attr(755,root,root) %{_bindir}/sstablesplit
 %attr(755,root,root) %{_bindir}/sstableupgrade
 %attr(755,root,root) %{_sbindir}/cassandra
 %{_datadir}/%{shname}
@@ -120,6 +125,11 @@ fi
 %attr(755,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.sh
 %attr(640,root,cassandra) /var/lib/%{shname}/conf/*.txt
 %attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.yaml
+%attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.xml
+%attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/hotspot_compiler
+%attr(750,cassandra,cassandra) %dir /var/lib/%{shname}/conf/triggers
+%attr(640,root,cassandra) /var/lib/%{shname}/conf/triggers/*.txt
+
 %attr(750,cassandra,cassandra) %dir /var/log/%{shname}
 %attr(750,cassandra,cassandra) %dir /var/run/%{shname}
 %{py_sitescriptdir}/cqlshlib