natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Mick Semb Wever 2021-03-09 22:35:22 +01:00
parent 9bc8d0b452 67b8504b20
commit 65653af2ce
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -45,6 +45,7 @@ Merged from 3.0:
* Fix skipping on pre-3.0 created compact storage sstables due to missing primary key liveness (CASSANDRA-16226)
* Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
Merged from 2.2:
* Fix centos packaging for arm64, >=3.0 rpm's now require python3 (CASSANDRA-16477)
* Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
4.0-beta4

10
redhat/cassandra.spec
View File

@ -6,6 +6,8 @@
# binary executable files in our 'noarch' package
%define _binaries_in_noarch_packages_terminate_build 0
%define __python /usr/bin/python3
%global username cassandra
# input of ~alphaN, ~betaN, ~rcN package versions need to retain upstream '-alphaN, etc' version for sources
@ -27,7 +29,7 @@ BuildRequires: ant >= 1.9
BuildRequires: ant-junit >= 1.9
Requires: jre >= 1.8.0
Requires: python(abi) >= 2.7
Requires: python(abi) >= 3.6
Requires(pre): user(cassandra)
Requires(pre): group(cassandra)
Requires(pre): shadow-utils
@ -67,7 +69,7 @@ mkdir -p %{buildroot}/var/lib/%{username}/saved_caches
mkdir -p %{buildroot}/var/lib/%{username}/hints
mkdir -p %{buildroot}/var/run/%{username}
mkdir -p %{buildroot}/var/log/%{username}
( cd pylib && python2.7 setup.py install --no-compile --root %{buildroot}; )
( cd pylib && %{__python} setup.py install --no-compile --root %{buildroot}; )
# patches for data and log paths
patch -p1 < debian/patches/cassandra_yaml_dirs.diff
@ -143,8 +145,8 @@ exit 0
%attr(755,%{username},%{username}) %config(noreplace) /var/lib/%{username}/*
%attr(755,%{username},%{username}) /var/log/%{username}*
%attr(755,%{username},%{username}) /var/run/%{username}*
/usr/lib/python2.7/site-packages/cqlshlib/
/usr/lib/python2.7/site-packages/cassandra_pylib*.egg-info
%{python_sitelib}/cqlshlib/
%{python_sitelib}/cassandra_pylib*.egg-info
%post
alternatives --install /%{_sysconfdir}/%{username}/conf %{username} /%{_sysconfdir}/%{username}/default.conf/ 0