Merge pull request #14806 from Michael-Gardner/HPCC-25667

HPCC-25667 Re-Add 3.1.1 spark submodule and disable brp-python-bytecode in rpmbuild

Reviewed-By: Xiaoming Wang <xiaoming.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

CMakeLists.txt

@@ -395,11 +395,12 @@ if(TOP_LEVEL_PROJECT)
             ## CPack instruction required for RPM
             ###
             set(CPACK_RPM_SPEC_MORE_DEFINE
-                "%define _use_internal_dependency_generator 0
-                %define __getdeps()while read file; do /usr/lib/rpm/rpmdeps -%{1} ${file} | %{__grep} -v libantlr3c.so | %{__grep} -v libtbb.so ; done | /bin/sort -u
-                %define __find_provides /bin/sh -c '%{__getdeps P}'
-                %define __find_requires /bin/sh -c '%{__getdeps R}'
-                %undefine __brp_mangle_shebangs")
+"%define _use_internal_dependency_generator 0
+%define __getdeps() while read file; do /usr/lib/rpm/rpmdeps -%{1} ${file} | %{__grep} -v libantlr3c.so | %{__grep} -v libtbb.so ; done | /bin/sort -u
+%define __find_provides /bin/sh -c '%{__getdeps P}'
+%define __find_requires /bin/sh -c '%{__getdeps R}'
+%undefine __brp_mangle_shebangs
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')")
             message("-- Will build RPM package")
             message("-- Packing BASH installation files")
             if(CLIENTTOOLS_ONLY)

plugins/spark/spark-hadoop

@@ -1 +1 @@
-Subproject commit f812403ac05fea67660b4b964d66d294a6f3bb12
+Subproject commit 730e28948311c5bebc7e217bb8c1e58318ed74d1