X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cassandra-bin.spec;h=23c63a2080516d7e5a027c4ba6680e7fa388053e;hb=f25270269917dbed00053cad8841fc8e6451c420;hp=501c7a3a0070a69975447c2ddbff2dc0f77041e7;hpb=f26b5bafb4fd32fb66f8eedd053572b42ad9c570;p=packages%2Fcassandra-bin.git

diff --git a/cassandra-bin.spec b/cassandra-bin.spec
index 501c7a3..23c63a2 100644
--- a/cassandra-bin.spec
+++ b/cassandra-bin.spec
@@ -1,24 +1,31 @@
-%include	/usr/lib/rpm/macros.java
-# TODO: Fix .init  cassandra status does not work now.
-# TODO: Fix .init restarts, now seems stopping does not wait until cassandra is really stopped ?
+# TODO: Fix .init cassandra status does not work now.
+# TODO: Fix .init stop routine it is now subset of PLD default one
+# TODO: Fix of data/ cassandra created dirs/files privilages (now they are all readable)
+# TODO: Consider adding
+#		cassandra	-	memlock	unlimited
+#   to /etc/security/limits.conf ?
 
-%define     shname cassandra
-%define     rccode rc3
+%define	shname cassandra
+%include	/usr/lib/rpm/macros.java
 Summary:	Cassandra database binary package
-Summary(pl.UTF-8):	Baza danych Cassandra wersja binarna.
+Summary(pl.UTF-8):	Binarna redystrybucja bazy danych Cassandra
 Name:		cassandra-bin
-Version:	0.7.0
-Release:	0.%{rccode}.2
+Version:	0.8.9
+Release:	1
 License:	ASF
 Group:		Applications/Databases
-Source0:	http://mirror.nyi.net/apache//cassandra/%{version}/apache-cassandra-%{version}-%{rccode}-bin.tar.gz
-# Source0-md5:	8e5cfc07178cd57e05ef81cad18ef170
+# http://www.apache.org/dyn/closer.cgi?path=/cassandra/0.8.7/apache-cassandra-0.8.7-bin.tar.gz
+Source0:	http://ftp.tpnet.pl/vol/d1/apache//cassandra/%{version}/apache-cassandra-%{version}-bin.tar.gz
+# Source0-md5:	bce05ca64217f7317190e46428a6df3c
 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
-Suggests:	jna
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
+Suggests:	java-jna
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,49 +36,25 @@ Cassandra is eventually consistent. Like BigTable, Cassandra provides
 a ColumnFamily-based data model richer than typical key/value systems.
 
 %description -l pl.UTF-8
-Cassandra łaczy technologie systemów rozproszonych z Dynamo i model
-danych z Googlowskiego BigTable. Tak jak Dynamo, Cassandra is
+Cassandra łączy technologie systemów rozproszonych z Dynamo i model
+danych z googlowskiego BigTable. Tak jak Dynamo, Cassandra jest
 ostatecznie spójna. Tak jak BigTable daje do dyspozycji model danych
-oparty na ColumnFamily bogatszy niż typowwe systemy klucza i wartości.
+oparty na ColumnFamily, bogatszy niż typowe systemy klucza i wartości.
 
 %prep
-%setup -q -n apache-cassandra-%{version}-%{rccode}
-
-%build
+%setup -q -n apache-cassandra-%{version}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{shname}/
-install -d $RPM_BUILD_ROOT%{_datadir}/%{shname}
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d/
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{shname}
-cp -p lib/*.jar $RPM_BUILD_ROOT%{_datadir}/%{shname}
-install -d $RPM_BUILD_ROOT%{_sbindir}
-cp -p bin/cassandra $RPM_BUILD_ROOT%{_sbindir}
-install -d $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/cassandra-cli $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/nodetool $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/clustertool $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/json2sstable $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/sstable2json $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/schematool $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/config-converter $RPM_BUILD_ROOT%{_bindir}
-cp -p bin/sstablekeys $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d/,%{_sysconfdir}/%{shname},%{_bindir},%{_sbindir},%{_datadir}/%{shname}} \
+	$RPM_BUILD_ROOT/var/{lib/%{shname}/{commitlog,conf,data,saved_caches},{log,run}/%{shname}}
+
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/cassandra
-install -d $RPM_BUILD_ROOT/var/lib/%{shname}/commitlog
-install -d $RPM_BUILD_ROOT/var/lib/%{shname}/data
-install -d $RPM_BUILD_ROOT/var/lib/%{shname}/saved_caches
-install -d $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-cp -p conf/log4j-server.properties $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-cp -p conf/cassandra.yaml $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-cp -p conf/cassandra-env.sh $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-cp -p conf/access.properties $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-cp -p conf/passwd.properties $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-cp -p conf/cassandra-topology.properties $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-cp -p conf/README.txt $RPM_BUILD_ROOT/var/lib/%{shname}/conf
-install -d $RPM_BUILD_ROOT/var/run/%{shname}
-install -d $RPM_BUILD_ROOT/var/log/%{shname}
+cp -p bin/{*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}
+cp -p conf/{*.properties,cassandra-env.sh,cassandra.yaml,README.txt} $RPM_BUILD_ROOT/var/lib/%{shname}/conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,29 +63,28 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 259 -r cassandra
 %useradd -M -o -r -u 259 -d /var/lib/%{shname} -s /bin/sh -g cassandra -c "Cassandra Server" cassandra
 
+%post
+/sbin/chkconfig --add cassandra
+%service cassandra restart
+
 %preun
 if [ "$1" = "0" ]; then
-    %service cassandra stop
-    /sbin/chkconfig --del cassandra
+	%service cassandra stop
+	/sbin/chkconfig --del cassandra
 fi
 
-# %post upstart
-# %upstart_post cassandra
-
-# %postun upstart
-# %upstart_postun cassandra
-
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt LICENSE.txt README.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}/nodetool
-%attr(755,root,root) %{_bindir}/clustertool
+# %attr(755,root,root) %{_bindir}/clustertool
 %attr(755,root,root) %{_bindir}/json2sstable
 %attr(755,root,root) %{_bindir}/sstable2json
-%attr(755,root,root) %{_bindir}/schematool
-%attr(755,root,root) %{_bindir}/config-converter
+%attr(755,root,root) %{_bindir}/sstableloader
+# %attr(755,root,root) %{_bindir}/schematool
+# %attr(755,root,root) %{_bindir}/config-converter
 %attr(755,root,root) %{_bindir}/sstablekeys
 %attr(755,root,root) %{_sbindir}/cassandra
 %{_datadir}/%{shname}
@@ -112,5 +94,5 @@ 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(750,cassandra,cassandra) %dir /var/run/%{shname}
 %attr(750,cassandra,cassandra) %dir /var/log/%{shname}
+%attr(750,cassandra,cassandra) %dir /var/run/%{shname}