From 2e547dfbc40e6b500db506353bced161c66f3113 Mon Sep 17 00:00:00 2001
From: Mick Semb Wever <mck@apache.org>
Date: Mon, 2 Aug 2021 11:36:36 +0200
Subject: [PATCH] Add python2 location to RPMs

Patch by Mck Semb Wever; reviewed by brandonwilliams for
CASSANDRA-16822
---
 CHANGES.txt           | 1 +
 redhat/cassandra.spec | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d3a26b60b4..a38085384f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.20
+ * Add python2 location to RPMs (CASSANDRA-16822)
  * CQL shell should prefer newer TLS version by default (CASSANDRA-16695)
  * Fix Debian init start/stop (CASSANDRA-15770)
  * Remove ant targets list-jvm-dtests and ant list-jvm-upgrade-dtests (CASSANDRA-16519)
diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec
index 91115e8c63..1a1a42f8e8 100644
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@ -85,6 +85,9 @@ mkdir -p %{buildroot}/var/lib/%{username}/saved_caches
 mkdir -p %{buildroot}/var/run/%{username}
 mkdir -p %{buildroot}/var/log/%{username}
 ( cd pylib && %{__python} setup.py install --no-compile --root %{buildroot}; )
+# cqlsh before Cassandra version 4.0 still requires python2
+mkdir -p %{buildroot}/usr/lib/python2.7/site-packages
+cp -r %{buildroot}%{python_sitelib}/cqlshlib %{buildroot}/usr/lib/python2.7/site-packages/
 
 # patches for data and log paths
 patch -p1 < debian/patches/001cassandra_yaml_dirs.dpatch
@@ -158,6 +161,8 @@ exit 0
 %attr(755,%{username},%{username}) /var/run/%{username}*
 %{python_sitelib}/cqlshlib/
 %{python_sitelib}/cassandra_pylib*.egg-info
+# cqlsh before Cassandra version 4.0 still requires python2
+/usr/lib/python2.7/site-packages/cqlshlib
 
 %post
 alternatives --install /%{_sysconfdir}/%{username}/conf %{username} /%{_sysconfdir}/%{username}/default.conf/ 0