packages: cassandra-bin/cassandra-bin.spec - cosmetics: %install syntax (re...

gotar gotar at pld-linux.org
Wed Sep 7 20:08:26 CEST 2011


Author: gotar                        Date: Wed Sep  7 18:08:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics: %install syntax (removed %_javadir, kept still unpackaged
  %_sysconfdir}/%shname and /var/lib/%shname/{commitlog,data,saved_caches}),
  descriptions, typos, whitespace

---- Files affected:
packages/cassandra-bin:
   cassandra-bin.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/cassandra-bin/cassandra-bin.spec
diff -u packages/cassandra-bin/cassandra-bin.spec:1.16 packages/cassandra-bin/cassandra-bin.spec:1.17
--- packages/cassandra-bin/cassandra-bin.spec:1.16	Wed Sep  7 09:58:40 2011
+++ packages/cassandra-bin/cassandra-bin.spec	Wed Sep  7 20:08:21 2011
@@ -1,21 +1,21 @@
 # $Revision$, $Date$
-# TODO: Fix .init  cassandra status does not work now.
+# 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
+#		cassandra	-	memlock	unlimited
 #   to /etc/security/limits.conf ?
 
-%define     shname cassandra
+%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.9
 Release:	1
 License:	ASF
 Group:		Applications/Databases
-Source0:        http://ftp.tpnet.pl/vol/d1/apache//cassandra/%{version}/apache-cassandra-%{version}-bin.tar.gz
+Source0:	http://ftp.tpnet.pl/vol/d1/apache//cassandra/%{version}/apache-cassandra-%{version}-bin.tar.gz
 # Source0-md5:	6c7ae6a2c2e58e72261fa1f7321696fb
 Source1:	cassandra.in.sh
 Source2:	%{shname}.init
@@ -35,47 +35,24 @@
 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 jest
+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}
 
 %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,config-converter} $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
@@ -114,8 +91,8 @@
 %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}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -123,6 +100,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2011/09/07 18:08:21  gotar
+- cosmetics: %install syntax (removed %_javadir, kept still unpackaged
+  %_sysconfdir}/%shname and /var/lib/%shname/{commitlog,data,saved_caches}),
+  descriptions, typos, whitespace
+
 Revision 1.16  2011/09/07 07:58:40  matkor
 - Version 0.7.9-1.
 
@@ -157,7 +139,6 @@
 - Final 0.7.0-1.
 
 Revision 1.5  2011/01/03 15:21:34  matkor
-
 - Updated to rc4.
   Fixed working as cassandra user.
   Fixed java class path to use java-jna.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cassandra-bin/cassandra-bin.spec?r1=1.16&r2=1.17&f=u



More information about the pld-cvs-commit mailing list