X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=cassandra-bin.spec;h=5c759adcf18e779bbfca10d855639b616aff9ae2;hb=1d4589447800bf21c2a078e8161eaed5df07e3dc;hp=9eace70840f07887ac1e0fbb67957e3eeff03b43;hpb=16c24e02a86dc9327e9a22bdf065efb9ccd64a3f;p=packages%2Fcassandra-bin.git

diff --git a/cassandra-bin.spec b/cassandra-bin.spec
index 9eace70..5c759ad 100644
--- a/cassandra-bin.spec
+++ b/cassandra-bin.spec
@@ -1,27 +1,28 @@
-%include	/usr/lib/rpm/macros.java
 # 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          
+# TODO: Consider adding
 #                   cassandra       -       memlock         unlimited
 #   to /etc/security/limits.conf ?
 
 %define     shname cassandra
-%define     rccode rc4
+%include	/usr/lib/rpm/macros.java
 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
+Version:	0.7.4
+Release:	1
 License:	ASF
 Group:		Applications/Databases
-Source0:	http://mirror.nyi.net/apache//cassandra/%{version}/apache-cassandra-%{version}-%{rccode}-bin.tar.gz
-# Source0-md5:	19b26eb1d25454a2da0731b769ab3066
+Source0:        http://ftp.tpnet.pl/vol/d1/apache//cassandra/%{version}/apache-cassandra-%{version}-bin.tar.gz
+# Source0-md5:	ee0d7ac9b73dedb0a5dca1c34499c2d5
 Source1:	cassandra.in.sh
 Source2:	%{shname}.init
 URL:		http://cassandra.apache.org/
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Suggests:	java-jna
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,14 +35,12 @@ 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
+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.
 
 %prep
-%setup -q -n apache-cassandra-%{version}-%{rccode}
-
-%build
+%setup -q -n apache-cassandra-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,18 +83,16 @@ 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