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 index 7dc7b7b6f2093e7cee43b3da2f2a445cf4ef1373..e80f132736ba3ad68815e0b78f2def7540e8a207 100644 --- 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 @@ -20,6 +20,9 @@ index 7c60f8f..4b993ee 100644 1.6.0 spark 1.7.30 +@@ -3202,1 +3202,1 @@ +- 1.0.4 ++ 1.0.3 -- 2.23.0 diff --git a/0001-modify-maven-version-for-3.8.4-to-3.6.3.patch b/0001-modify-maven-version-for-3.8.4-to-3.6.3.patch new file mode 100644 index 0000000000000000000000000000000000000000..a74b7d0b98128abad6fa42a06e258f0c874e807e --- /dev/null +++ b/0001-modify-maven-version-for-3.8.4-to-3.6.3.patch @@ -0,0 +1,21 @@ +diff -Naur spark-3.3.0/pom.xml spark-3.3.0-change/pom.xml +--- spark-3.3.0/pom.xml 2022-06-10 01:55:37.000000000 +0800 ++++ spark-3.3.0-change/pom.xml 2022-07-28 17:00:53.477569224 +0800 +@@ -109,7 +109,7 @@ + 1.8 + ${java.version} + ${java.version} +- 3.8.4 ++ 3.6.3 + 1.6.0 + spark + 1.7.32 +@@ -3355,7 +3355,7 @@ + + org.antipathy + mvn-scalafmt_${scala.binary.version} +- 1.0.4 ++ 1.0.3 + + ${scalafmt.parameters} + ${scalafmt.skip} diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..bd9ac9f83b783cdb9813dd06d473ebafbf96620c --- /dev/null +++ b/settings.xml @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + big + * + huaweicloud + https://mirrors.huaweicloud.com/repository/maven/ + true + + + + + + + + + + + + diff --git a/spark.spec b/spark.spec index 84c19224791fdca66c9d4c2dde8e2bcc19cb49c4..76492a0f6ec134b5eab9632e93387fb52c1ba268 100644 --- a/spark.spec +++ b/spark.spec @@ -3,13 +3,14 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.0.1 -Release: 1.0 +Version: 3.3.0 +Release: 1 License: Apache License v2.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-modify-maven-version-for-3.8.4-to-3.6.3.patch BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven @@ -27,7 +28,8 @@ Apache Spark achieves high performance for both batch and streaming data, using %patch0001 -p1 %build -mvn -DskipTests clean package +cp %{SOURCE1} ./settings.xml +mvn -DskipTests -Dmaven.test.skip=true clean package -s settings.xml %install mkdir -p %{buildroot}/opt/ @@ -38,6 +40,12 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog +* Fri Mar 25 2022 xiexing - 3.2.0-2 +- fix install problem + +* Fri Nov 12 2021 Wuzeyiii - 1.2 +- Update spark version + * Fri Sep 18 2020 Hubble_Zhu - 1.0 - Init package diff --git a/v3.2.0.tar.gz b/v3.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ec6079677718a2694a54168cabdf3df84c490c8d Binary files /dev/null and b/v3.2.0.tar.gz differ diff --git a/v3.3.0.tar.gz b/v3.3.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a58bcd5b572628ce15e27394ee53c14e103dfa07 Binary files /dev/null and b/v3.3.0.tar.gz differ