Author: eevans
Date: Tue Dec 21 22:51:35 2010
New Revision: 1051691
URL: http://svn.apache.org/viewvc?rev=1051691&view=rev
Log:
rpm spec file updates
Patch by Nate McCall for CASSANDRA-1890
Modified:
cassandra/branches/cassandra-0.7/redhat/apache-cassandra.spec
Modified: cassandra/branches/cassandra-0.7/redhat/apache-cassandra.spec
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/redhat/apache-cassandra.spec?rev=1051691&r1=1051690&r2=1051691&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/redhat/apache-cassandra.spec (original)
+++ cassandra/branches/cassandra-0.7/redhat/apache-cassandra.spec Tue Dec 21
22:51:35 2010
@@ -2,22 +2,27 @@
%global username cassandra
+%define relname %{name}-%{version}-%{release}
+
Name: apache-cassandra
Version: 0.7.0
-Release: 1%{?dist}
+Release: rc3
Summary: Cassandra is a highly scalable, eventually consistent,
distributed, structured key-value store.
Group: Development/Libraries
-License: BSD
+License: Apache Software License
URL: http://cassandra.apache.org/
-Source0:
http://www.ibiblio.org/pub/mirrors/apache/%{username}/%{version}/%{name}-%{version}-src.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:
http://www.ibiblio.org/pub/mirrors/apache/%{username}/%{version}/%{relname}-src.tar.gz
+BuildRoot: %{_tmppath}/%{relname}-root-%(%{__id_u} -n)
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: ant
BuildRequires: ant-nodeps
+Conflicts: cassandra
+Obsoletes: cassandra07
+
Requires: java >= 1.6.0
Requires: jna >= 3.2.7
Requires: jpackage-utils
@@ -35,10 +40,10 @@ and the data model from Google's BigTabl
eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
data model richer than typical key/value systems.
-For more information see http://incubator.apache.org/cassandra
+For more information see http://cassandra.apache.org/
%prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n %{relname}-src
%build
ant clean jar -Drelease=true
@@ -65,7 +70,8 @@ mv bin/cassandra.in.sh %{buildroot}/usr/
mv bin/cassandra %{buildroot}/usr/sbin
rm bin/*.bat
cp -p bin/* %{buildroot}/usr/bin
-cp build/%{name}-%{version}.jar %{buildroot}/usr/share/%{username}/lib
+# Handle the case of interim SNAPHOST builds
+cp build/%{relname}*jar %{buildroot}/usr/share/%{username}/lib
mkdir -p %{buildroot}/var/lib/%{username}/commitlog
mkdir -p %{buildroot}/var/lib/%{username}/data
mkdir -p %{buildroot}/var/lib/%{username}/saved_caches