Browse code

Remove build/libs from cassandra package & add gawk requires

Change-Id: I6f085a955237fcdfb29a69ac3c1e6faacaae4980
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3576
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>

harishspqr authored on 2017/08/17 02:53:44
Showing 2 changed files
... ...
@@ -14,6 +14,7 @@ StandardOutput=journal
14 14
 Restart=always
15 15
 RestartSec=30
16 16
 LimitNOFILE=infinity
17
+SuccessExitStatus=143
17 18
 
18 19
 [Install]
19 20
 WantedBy=multi-user.target
... ...
@@ -3,7 +3,7 @@
3 3
 Summary:        Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store
4 4
 Name:           cassandra
5 5
 Version:        3.10
6
-Release:        5%{?dist}
6
+Release:        6%{?dist}
7 7
 URL:            http://cassandra.apache.org/
8 8
 License:        Apache License, Version 2.0
9 9
 Group:          Applications/System
... ...
@@ -18,6 +18,7 @@ BuildRequires:  unzip zip
18 18
 BuildRequires:  openjdk
19 19
 BuildRequires:  wget
20 20
 Requires:       openjre
21
+Requires:       gawk
21 22
 %description
22 23
 Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store. Cassandra brings together the distributed systems technologies from Dynamo and the log-structured storage engine from Google's BigTable.
23 24
 
... ...
@@ -48,9 +49,6 @@ mkdir -p %{buildroot}/var/run/cassandra
48 48
 mkdir -p %{buildroot}/etc/profile.d
49 49
 mkdir -p %{buildroot}/var/opt/cassandra
50 50
 
51
-rm build/lib/jars/hadoop-*
52
-rm build/classes/main/org/apache/cassandra/hadoop/HadoopCompat.class
53
-
54 51
 cp bin/%{name} %{buildroot}%{_sbindir}
55 52
 cp bin/%{name}.in.sh %{buildroot}%{_datadir}/cassandra/
56 53
 cp bin/nodetool %{buildroot}%{_bindir}/
... ...
@@ -127,10 +125,13 @@ fi
127 127
 %{_sysconfdir}/sysconfig/cassandra
128 128
 /etc/profile.d/cassandra.sh
129 129
 /lib/systemd/system/cassandra.service
130
+%exclude /var/opt/cassandra/build/lib
130 131
 
131 132
 %changelog
133
+*   Tue Aug 15 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-6
134
+-   Remove build/libs directory from cassandra, add gawk requires
132 135
 *   Thu Jul 27 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-5
133
-*   Update logback jar (dependency) & remove hadoop jars
136
+-   Update logback jar (dependency) & remove hadoop jars
134 137
 *   Tue Jul 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-4
135 138
 -   Change cassandra service type as simple
136 139
 *   Mon Jul 10 2017 Xiaolin Li <xiaolinl@vmware.com> 3.10-3