diff --git a/0001-change-mvn-scalafmt.patch b/0001-change-mvn-scalafmt.patch new file mode 100644 index 0000000000000000000000000000000000000000..776e01f385dbbe24ebdaa28648d561cd8bdc6f74 --- /dev/null +++ b/0001-change-mvn-scalafmt.patch @@ -0,0 +1,12 @@ +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} +- 1.0.4 ++ 1.0.3 + + ${scalafmt.parameters} + ${scalafmt.skip} diff --git a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch b/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch deleted file mode 100644 index e80f132736ba3ad68815e0b78f2def7540e8a207..0000000000000000000000000000000000000000 --- a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b197048d8dcd5c3567fee87330b41b3938356123 Mon Sep 17 00:00:00 2001 -From: hubble_zhu -Date: Wed, 30 Sep 2020 14:53:42 +0800 -Subject: [PATCH] modify maven version for 3.6.3 to 3.5.4 - ---- - pom.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pom.xml b/pom.xml -index 7c60f8f..4b993ee 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -115,7 +115,7 @@ - 1.8 - ${java.version} - ${java.version} -- 3.6.3 -+ 3.5.4 - 1.6.0 - spark - 1.7.30 -@@ -3202,1 +3202,1 @@ -- 1.0.4 -+ 1.0.3 --- -2.23.0 - diff --git a/settings.xml b/settings.xml deleted file mode 100644 index bd9ac9f83b783cdb9813dd06d473ebafbf96620c..0000000000000000000000000000000000000000 --- a/settings.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - big - * - huaweicloud - https://mirrors.huaweicloud.com/repository/maven/ - true - - - - - - - - - - - - diff --git a/spark.spec b/spark.spec index ab8c9d20a751be5cbd126767b50880b45cc0d518..cee0a7c23ef56d91e855650588a877f6ab1ec2b5 100644 --- a/spark.spec +++ b/spark.spec @@ -3,14 +3,13 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.2.0 -Release: 2 -License: Apache License v2.0 +Version: 3.2.2 +Release: 1 +License: Apache 2.0 URL: http://spark.apache.org/ Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz -Source1: settings.xml -Patch0001: 0001-modify-maven-version-for-3.6.3-to-3.5.4.patch +Patch0001: 0001-change-mvn-scalafmt.patch BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven @@ -28,8 +27,7 @@ Apache Spark achieves high performance for both batch and streaming data, using %patch0001 -p1 %build -cp %{SOURCE1} ./settings.xml -mvn -DskipTests -Dmaven.test.skip=true clean package -s settings.xml +mvn -DskipTests -Dmaven.test.skip=true clean package %install mkdir -p %{buildroot}/opt/ @@ -40,8 +38,8 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog -* Fri Mar 25 2022 xiexing - 3.2.0-2 -- fix install problem +* Wed Aug 10 2022 xiexing - 3.2.2-1 +- update spark version * Fri Nov 12 2021 Wuzeyiii - 1.2 - Update spark version diff --git a/v3.0.1.tar.gz b/v3.0.1.tar.gz deleted file mode 100644 index f588c1714f4d5cc4716d092bb49d7f3490512477..0000000000000000000000000000000000000000 Binary files a/v3.0.1.tar.gz and /dev/null differ diff --git a/v3.2.0.tar.gz b/v3.2.2.tar.gz similarity index 73% rename from v3.2.0.tar.gz rename to v3.2.2.tar.gz index ec6079677718a2694a54168cabdf3df84c490c8d..c8232dafe1e61d8978efb67fc4585b80e414bda4 100644 Binary files a/v3.2.0.tar.gz and b/v3.2.2.tar.gz differ