diff --git a/0001-change-mvn-scalafmt.patch b/0001-change-mvn-scalafmt.patch deleted file mode 100644 index 776e01f385dbbe24ebdaa28648d561cd8bdc6f74..0000000000000000000000000000000000000000 --- a/0001-change-mvn-scalafmt.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-change-mvn-version.patch b/0001-change-mvn-version.patch new file mode 100644 index 0000000000000000000000000000000000000000..7b68b3817d1058326e99fbc260aba03d1862affc --- /dev/null +++ b/0001-change-mvn-version.patch @@ -0,0 +1,11 @@ +--- pom.xml 2022-10-09 08:38:25.774054209 +0000 ++++ temp/pom.xml 2022-10-09 08:37:52.916120006 +0000 +@@ -109,7 +109,7 @@ + 1.8 + ${java.version} + ${java.version} +- 3.8.4 ++ 3.6.3 + 1.6.0 + spark + 1.7.32 diff --git a/v3.2.2.tar.gz b/spark-3.3.0.tgz similarity index 71% rename from v3.2.2.tar.gz rename to spark-3.3.0.tgz index c8232dafe1e61d8978efb67fc4585b80e414bda4..f2f0af420136783a77e7d1ff3730423728ef87ad 100644 Binary files a/v3.2.2.tar.gz and b/spark-3.3.0.tgz differ diff --git a/spark.spec b/spark.spec index cee0a7c23ef56d91e855650588a877f6ab1ec2b5..9ec44f682d58925d4b1cb9ec329ea0749dc4d96d 100644 --- a/spark.spec +++ b/spark.spec @@ -3,13 +3,13 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.2.2 +Version: 3.3.0 Release: 1 License: Apache 2.0 URL: http://spark.apache.org/ -Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz +Source0: https://dlcdn.apache.org/%{name}/%{version}/%{name}-%{version}.tgz -Patch0001: 0001-change-mvn-scalafmt.patch +Patch0001: 0001-change-mvn-version.patch BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven @@ -27,7 +27,7 @@ Apache Spark achieves high performance for both batch and streaming data, using %patch0001 -p1 %build -mvn -DskipTests -Dmaven.test.skip=true clean package +mvn -DskipTests -Dmaven.test.skip=true clean package %install mkdir -p %{buildroot}/opt/ @@ -38,6 +38,9 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog +* Sun Sep 30 2022 xumhan - 3.3.0 +- update spark version + * Wed Aug 10 2022 xiexing - 3.2.2-1 - update spark version