已开启
replace deprecated %patchN syntax with %patch -P N #82
majianhan创建于 3月10日
replace deprecated %patchN syntax with %patch -P N #82
已开启
共 1 个文件变更+10-7
| @@ -4,7 +4,7 @@ | |||
| 4 | Summary: A unified analytics engine for large-scale data processing. | 4 | Summary: A unified analytics engine for large-scale data processing. |
| 5 | Name: spark | 5 | Name: spark |
| 6 | Version: 3.5.0 | 6 | Version: 3.5.0 |
| 7 | -Release: 5 | 7 | +Release: 6 |
| 8 | License: Apache 2.0 | 8 | License: Apache 2.0 |
| 9 | URL: http://spark.apache.org/ | 9 | URL: http://spark.apache.org/ |
| 10 | Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz | 10 | Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz |
| @@ -42,7 +42,7 @@ mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dver | |||
| 42 | # protoc | 42 | # protoc |
| 43 | tar -mxf %{SOURCE1} -C ${HOME}/%{name}-prep_dir | 43 | tar -mxf %{SOURCE1} -C ${HOME}/%{name}-prep_dir |
| 44 | pushd ${HOME}/%{name}-prep_dir/protobuf-3.21.7 | 44 | pushd ${HOME}/%{name}-prep_dir/protobuf-3.21.7 |
| 45 | -%patch1000 -p1 | 45 | +%patch -P 1000 -p1 |
| 46 | ./autogen.sh | 46 | ./autogen.sh |
| 47 | ./protoc-artifacts/build-protoc.sh linux riscv64 protoc | 47 | ./protoc-artifacts/build-protoc.sh linux riscv64 protoc |
| 48 | mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.21.7 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe | 48 | mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.21.7 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe |
| @@ -50,7 +50,7 @@ popd | |||
| 50 | # protoc-jar | 50 | # protoc-jar |
| 51 | tar -mxf %{SOURCE2} -C ${HOME}/%{name}-prep_dir | 51 | tar -mxf %{SOURCE2} -C ${HOME}/%{name}-prep_dir |
| 52 | pushd ${HOME}/%{name}-prep_dir/protoc-jar-3.11.4 | 52 | pushd ${HOME}/%{name}-prep_dir/protoc-jar-3.11.4 |
| 53 | -%patch1001 -p1 | 53 | +%patch -P 1001 -p1 |
| 54 | mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true | 54 | mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true |
| 55 | popd | 55 | popd |
| 56 | # protoc-jar-maven-plugin | 56 | # protoc-jar-maven-plugin |
| @@ -65,7 +65,7 @@ tar xzf %{SOURCE5} -C %{_tmppath}/source | |||
| 65 | # protoc-gen-grpc-java | 65 | # protoc-gen-grpc-java |
| 66 | tar -mxf %{SOURCE6} -C ${HOME}/%{name}-prep_dir | 66 | tar -mxf %{SOURCE6} -C ${HOME}/%{name}-prep_dir |
| 67 | pushd ${HOME}/%{name}-prep_dir/grpc-java-1.56.0 | 67 | pushd ${HOME}/%{name}-prep_dir/grpc-java-1.56.0 |
| 68 | -%patch1002 -p1 | 68 | +%patch -P 1002 -p1 |
| 69 | sed -i "s,@HOME@,${HOME},g" build.gradle | 69 | sed -i "s,@HOME@,${HOME},g" build.gradle |
| 70 | sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties | 70 | sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties |
| 71 | SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh | 71 | SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh |
| @@ -75,9 +75,9 @@ popd | |||
| 75 | 75 | ||
| 76 | %setup -q | 76 | %setup -q |
| 77 | 77 | ||
| 78 | -%patch0001 -p1 | 78 | +%patch -P 0001 -p1 |
| 79 | -%patch0002 -p1 | 79 | +%patch -P 0002 -p1 |
| 80 | -%patch0003 -p1 | 80 | +%patch -P 0003 -p1 |
| 81 | 81 | ||
| 82 | %ifarch riscv64 | 82 | %ifarch riscv64 |
| 83 | sed -i -e 's/protoVersion = "3.23.4/protoVersion = "'${PROTOC_VERSION}/'' project/SparkBuild.scala | 83 | sed -i -e 's/protoVersion = "3.23.4/protoVersion = "'${PROTOC_VERSION}/'' project/SparkBuild.scala |
| @@ -99,6 +99,9 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} | |||
| 99 | 99 | ||
| 100 | 100 | ||
| 101 | %changelog | 101 | %changelog |
| 102 | +* Tue Mar 10 2026 majianhan <majianhan@kylinos.cn> - 3.5.0-6 | ||
| 103 | +- DESC:replace deprecated %%patchN syntax with %%patch -P N for RPM 4.18+ compatibility | ||
| 104 | + | ||
| 102 | * Thu Dec 26 2024 changtao <changtao@kylinos.cn> - 3.5.0-5 | 105 | * Thu Dec 26 2024 changtao <changtao@kylinos.cn> - 3.5.0-5 |
| 103 | - Type: CVE | 106 | - Type: CVE |
| 104 | - CVE: CVE-2024-23945 | 107 | - CVE: CVE-2024-23945 |