packages: cassandra-bin/cassandra-bin.spec, cassandra-bin/cassandra.in.sh, ...
matkor
matkor at pld-linux.org
Wed Dec 29 11:39:32 CET 2010
Author: matkor Date: Wed Dec 29 10:39:32 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Release 1. Adapterized, cleaning. Works enough good for me.
---- Files affected:
packages/cassandra-bin:
cassandra-bin.spec (1.1 -> 1.2) , cassandra.in.sh (1.1 -> 1.2) , cassandra.init (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/cassandra-bin/cassandra-bin.spec
diff -u packages/cassandra-bin/cassandra-bin.spec:1.1 packages/cassandra-bin/cassandra-bin.spec:1.2
--- packages/cassandra-bin/cassandra-bin.spec:1.1 Tue Dec 28 16:40:36 2010
+++ packages/cassandra-bin/cassandra-bin.spec Wed Dec 29 11:39:27 2010
@@ -1,19 +1,21 @@
+# $Revision$, $Date$
%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 ?
-Summary: Cassandra database binary package.
-Summary(pl.UTF-8): Baza danych Cassandra wersja binarna
-Name: cassandra-bin
%define shname cassandra
-Version: 0.7.0
%define rccode rc3
-Release: 0.%{rccode}.0.1
+Summary: Cassandra database binary package
+Summary(pl.UTF-8): Baza danych Cassandra wersja binarna.
+Name: cassandra-bin
+Version: 0.7.0
+Release: 0.%{rccode}.1
License: ASF
Group: Applications/Databases
Source0: http://mirror.nyi.net/apache//cassandra/%{version}/apache-cassandra-%{version}-%{rccode}-bin.tar.gz
# Source0-md5: 8e5cfc07178cd57e05ef81cad18ef170
-Source1: cassandra.in.sh
-Source2: %{shname}.init
+Source1: cassandra.in.sh
+Source2: %{shname}.init
URL: http://cassandra.apache.org/
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
@@ -21,13 +23,16 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Cassandra brings together the distributed systems technologies from Dynamo
-and the data model from Google's BigTable. Like Dynamo, Cassandra is
-eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
-data model richer than typical key/value systems.
+Cassandra brings together the distributed systems technologies from
+Dynamo and the data model from Google's BigTable. Like Dynamo,
+Cassandra is eventually consistent. Like BigTable, Cassandra provides
+a ColumnFamily-based data model richer than typical key/value systems.
%description -l pl.UTF-8
-TODO
+Cassandra łaczy technologie systemów rozproszonych z Dynamo i model
+danych z Googlowskiego BigTable. Tak jak Dynamo, Cassandra is
+ostatecznie spójna. Tak jak BigTable daje do dyspozycji model danych
+oparty na ColumnFamily bogatszy niż typowwe systemy klucza i wartości.
%prep
%setup -q -n apache-cassandra-%{version}-%{rccode}
@@ -37,32 +42,27 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{shname}/
-mkdir -p $RPM_BUILD_ROOT/usr/share/%{shname}
-# /usr/share/%{shname}/conf -> /etc/%{shname}/ - We do not want that , lets be ale to use many instances of cassandra like we do with postgresql
-# TODO: /usr/share/%{shname}/conf -> /var/lib/cassandra/conf
-# TODO: root:cassandra conf/*
-# mkdir -p $RPM_BUILD_ROOT/usr/share/%{shname}/conf
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
-cp -p %{SOURCE1} $RPM_BUILD_ROOT/usr/share/%{shname}
-# cp -p contrib/redhat/%{name} $RPM_BUILD_ROOT/etc/rc.d/init.d/
-cp -p lib/*.jar $RPM_BUILD_ROOT/usr/share/%{shname}
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-cp -p bin/cassandra $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-cp -p bin/cassandra-cli $RPM_BUILD_ROOT/usr/bin
-cp -p bin/nodetool $RPM_BUILD_ROOT/usr/bin
-cp -p bin/clustertool $RPM_BUILD_ROOT/usr/bin
-cp -p bin/json2sstable $RPM_BUILD_ROOT/usr/bin
-cp -p bin/sstable2json $RPM_BUILD_ROOT/usr/bin
-cp -p bin/schematool $RPM_BUILD_ROOT/usr/bin
-cp -p bin/config-converter $RPM_BUILD_ROOT/usr/bin
-cp -p bin/sstablekeys $RPM_BUILD_ROOT/usr/bin
+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 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/cassandra
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{shname}/commitlog
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{shname}/data
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{shname}/saved_caches
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{shname}/conf
+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
@@ -70,19 +70,16 @@
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
-mkdir -p $RPM_BUILD_ROOT/var/run/%{shname}
-mkdir -p $RPM_BUILD_ROOT/var/log/%{shname}
-
+install -d $RPM_BUILD_ROOT/var/run/%{shname}
+install -d $RPM_BUILD_ROOT/var/log/%{shname}
%clean
rm -rf $RPM_BUILD_ROOT
%pre
-# TODO:
%groupadd -g 259 -r cassandra
%useradd -M -o -r -u 259 -d /var/lib/%{shname} -s /bin/sh -g cassandra -c "Cassandra Server" cassandra
-# TODO:
%preun
if [ "$1" = "0" ]; then
%service cassandra stop
@@ -95,8 +92,6 @@
# %postun upstart
# %upstart_postun cassandra
-
-
%files
%defattr(644,root,root,755)
%doc CHANGES.txt LICENSE.txt README.txt NEWS.txt NOTICE.txt
@@ -110,16 +105,13 @@
%attr(755,root,root) %{_bindir}/config-converter
%attr(755,root,root) %{_bindir}/sstablekeys
%attr(755,root,root) %{_sbindir}/cassandra
-# %attr(755,root,root) /etc/rc.d/init.d/%{name}
-# %attr(754,root,root) /etc/rc.d/init.d/postgresql
-# %attr(755,root,root)
-/usr/share/%{shname}
+%{_datadir}/%{shname}
%attr(750,cassandra,cassandra) %dir /var/lib/%{shname}
%attr(750,root,cassandra) %dir /var/lib/%{shname}/conf
-%attr(640,root,cassandra) /var/lib/%{shname}/conf/*.yaml
+%attr(640,root,cassandra) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{shname}/conf/*.properties
+%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) /var/lib/%{shname}/conf/*.properties
-%attr(755,root,cassandra) /var/lib/%{shname}/conf/*.sh
+%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}
@@ -127,4 +119,8 @@
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.2 2010/12/29 10:39:27 matkor
+- Release 1. Adapterized, cleaning. Works enough good for me.
================================================================
Index: packages/cassandra-bin/cassandra.in.sh
diff -u packages/cassandra-bin/cassandra.in.sh:1.1 packages/cassandra-bin/cassandra.in.sh:1.2
--- packages/cassandra-bin/cassandra.in.sh:1.1 Tue Dec 28 16:40:36 2010
+++ packages/cassandra-bin/cassandra.in.sh Wed Dec 29 11:39:27 2010
@@ -45,10 +45,8 @@
# CLASSPATH=$CLASSPATH:$jar
# done
-
# for jar in /usr/share/cassandra/*.jar; do
# CLASSPATH=$CLASSPATH:$jar
# done
CLASSPATH=$CLASSPATH:/usr/share/cassandra/*
-print "DEBUG: CLASSPATH: $CLASSPATH"
================================================================
Index: packages/cassandra-bin/cassandra.init
diff -u packages/cassandra-bin/cassandra.init:1.1 packages/cassandra-bin/cassandra.init:1.2
--- packages/cassandra-bin/cassandra.init:1.1 Tue Dec 28 16:40:36 2010
+++ packages/cassandra-bin/cassandra.init Wed Dec 29 11:39:27 2010
@@ -1,11 +1,12 @@
#!/bin/sh
#
-# glusterfsd Cassandra
+# cassandra Cassandra
#
-# chkconfig: 345 14 89
+# chkconfig: 345 84 25
#
# description: Cassandra database node
#
+# processname: cassandra
# Source function library
. /etc/rc.d/init.d/functions
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cassandra-bin/cassandra-bin.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cassandra-bin/cassandra.in.sh?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cassandra-bin/cassandra.init?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list