From 9f72741f15fc20bfa3d7c4110991f3dc2c279119 Mon Sep 17 00:00:00 2001
From: vivostar <lishuaipeng651@gmail.com>
Date: Sun, 12 Feb 2023 22:27:48 +0800
Subject: [PATCH] BIGTOP-3908 Upgrade Spark Rpm Packages for PySpark Requres
 Python3

---
 .../src/common/spark/install_spark.sh         |  2 +-
 .../src/rpm/spark/SPECS/spark.spec            | 20 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/bigtop-packages/src/common/spark/install_spark.sh b/bigtop-packages/src/common/spark/install_spark.sh
index a8165c4302..c9dfa1a526 100644
--- a/bigtop-packages/src/common/spark/install_spark.sh
+++ b/bigtop-packages/src/common/spark/install_spark.sh
@@ -182,7 +182,7 @@ cat > $PREFIX/$BIN_DIR/pyspark <<EOF
 # Autodetect JAVA_HOME if not defined
 . /usr/lib/bigtop-utils/bigtop-detect-javahome
 
-export PYSPARK_PYTHON=python
+export PYSPARK_PYTHON=python3
 
 exec $LIB_DIR/bin/pyspark "\$@"
 EOF
diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
index 3610a49f30..10ba92c85c 100644
--- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
+++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
@@ -116,11 +116,7 @@ Server for Spark worker
 %package -n %{spark_pkg_name}-python
 Summary: Python client for Spark
 Group: Development/Libraries
-%if 0%{?rhel} >= 8
-Requires: %{spark_pkg_name}-core = %{version}-%{release}, python2
-%else
-Requires: %{spark_pkg_name}-core = %{version}-%{release}, python
-%endif
+Requires: %{spark_pkg_name}-core = %{version}-%{release}, python36
 
 %description -n %{spark_pkg_name}-python
 Includes PySpark, an interactive Python shell for Spark, and related libraries
@@ -183,19 +179,6 @@ bash $RPM_SOURCE_DIR/do-component-build
 %__rm -rf $RPM_BUILD_ROOT
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
 
-%if 0%{?rhel} >= 8
-PYSPARK_PYTHON=python2 bash $RPM_SOURCE_DIR/install_spark.sh \
-          --build-dir=`pwd`         \
-          --source-dir=$RPM_SOURCE_DIR \
-          --prefix=$RPM_BUILD_ROOT  \
-          --doc-dir=%{doc_spark} \
-          --lib-dir=%{usr_lib_spark} \
-          --var-dir=%{var_lib_spark} \
-          --bin-dir=%{bin_dir} \
-          --man-dir=%{man_dir} \
-          --etc-default=%{etc_default} \
-          --etc-spark=%{etc_spark}
-%else
 bash $RPM_SOURCE_DIR/install_spark.sh \
           --build-dir=`pwd`         \
           --source-dir=$RPM_SOURCE_DIR \
@@ -207,7 +190,6 @@ bash $RPM_SOURCE_DIR/install_spark.sh \
           --man-dir=%{man_dir} \
           --etc-default=%{etc_default} \
           --etc-spark=%{etc_spark}
-%endif
 
 %__rm -f $RPM_BUILD_ROOT/%{usr_lib_spark}/jars/hadoop-*.jar