diff --git a/0001-change-mvn-scalafmt.patch b/0001-change-mvn-scalafmt.patch index 776e01f385dbbe24ebdaa28648d561cd8bdc6f74..5376b918561a11fc478aa82667a9ae788afc5272 100644 --- a/0001-change-mvn-scalafmt.patch +++ b/0001-change-mvn-scalafmt.patch @@ -1,12 +1,21 @@ -diff -Naur spark-3.2.2/pom.xml spark-3.2.2-change/pom.xml ---- spark-3.2.2/pom.xml 2022-07-11 23:13:02.000000000 +0800 -+++ spark-3.2.2-change/pom.xml 2022-07-30 04:40:32.025984410 +0800 -@@ -3199,7 +3199,7 @@ - - org.antipathy - mvn-scalafmt_${scala.binary.version} +diff -Naur spark-3.5.0/pom.xml spark-3.5.0-change/pom.xml +--- spark-3.5.0/pom.xml 2023-09-09 09:24:06.000000000 +0800 ++++ spark-3.5.0-change/pom.xml 2023-09-21 16:07:19.952921078 +0800 +@@ -115,7 +115,7 @@ + 1.8 + ${java.version} + ${java.version} +- 3.8.8 ++ 3.6.3 + 3.1.0 + spark + 9.5 +@@ -442,7 +442,7 @@ + + org.scala-lang.modules + scala-parallel-collections_${scala.binary.version} - 1.0.4 + 1.0.3 - - ${scalafmt.parameters} - ${scalafmt.skip} + + --> + diff --git a/spark.spec b/spark.spec index cee0a7c23ef56d91e855650588a877f6ab1ec2b5..55c68ef3b446ae71f31d951e1bf80aaf1986d3e9 100644 --- a/spark.spec +++ b/spark.spec @@ -3,7 +3,7 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.2.2 +Version: 3.5.0 Release: 1 License: Apache 2.0 URL: http://spark.apache.org/ @@ -11,8 +11,7 @@ Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz Patch0001: 0001-change-mvn-scalafmt.patch -BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: maven +BuildRequires: java-1.8.0-openjdk-devel git maven Requires: java-1.8.0-openjdk @@ -27,7 +26,7 @@ Apache Spark achieves high performance for both batch and streaming data, using %patch0001 -p1 %build -mvn -DskipTests -Dmaven.test.skip=true clean package +./dev/make-distribution.sh --mvn mvn --name spark-3.5.0 --tgz -DskipTests -Dmaven.test.skip=true %install mkdir -p %{buildroot}/opt/ @@ -38,6 +37,9 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog +* Mon Sep 25 2023 xiexing - 3.5.0-1 +- update spark version 3.5.0 + * Wed Aug 10 2022 xiexing - 3.2.2-1 - update spark version diff --git a/v3.2.2.tar.gz b/v3.5.0.tar.gz similarity index 66% rename from v3.2.2.tar.gz rename to v3.5.0.tar.gz index c8232dafe1e61d8978efb67fc4585b80e414bda4..da675a6040ede244e861775d866e4886639d4ec7 100644 Binary files a/v3.2.2.tar.gz and b/v3.5.0.tar.gz differ