From 088a31b5d0bb367c5817fc8f7e8b16e218d4256e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=81=AC?= Date: Mon, 16 Dec 2024 02:21:31 +0000 Subject: [PATCH] fix build warnings: patchN is deprecated, use patch N (or %patch -P N) --- hadoop.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hadoop.spec b/hadoop.spec index 4b932ae..13f8f08 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -13,7 +13,7 @@ Name: hadoop Version: 3.3.6 -Release: 7 +Release: 8 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -278,7 +278,7 @@ mkdir -p ${HOME}/%{name}-prep_dir # protoc tar -mxf %{SOURCE17} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/protobuf-3.7.1 -%patch1000 -p1 +%patch 1000 -p1 ./autogen.sh ./protoc-artifacts/build-protoc.sh linux riscv64 protoc mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.7.1 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe @@ -289,7 +289,7 @@ cp %{SOURCE19} %{_tmppath}/source tar xzf %{SOURCE20} -C %{_tmppath}/source tar -mxf %{SOURCE21} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/protobuf-3.11.0 -%patch1002 -p1 +%patch 1002 -p1 ./autogen.sh ./protoc-artifacts/build-protoc.sh linux riscv64 protoc mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.11.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe @@ -297,7 +297,7 @@ popd # protoc-gen-grpc-java tar -mxf %{SOURCE18} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/grpc-java-1.26.0 -%patch1001 -p1 +%patch 1001 -p1 sed -i "s,@HOME@,${HOME},g" build.gradle sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh @@ -305,9 +305,9 @@ mvn install:install-file -DgroupId=io.grpc -DartifactId=protoc-gen-grpc-java -Dv popd mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=/usr/bin/protoc %setup -qn %{name}-%{version}-src -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch 0 -p1 +%patch 1 -p1 +%patch 2 -p1 %else %autosetup -p1 -n %{name}-%{version}-src %endif @@ -1207,6 +1207,9 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Mon Dec 16 2024 litian - 3.3.6-8 +- fix %patchN is deprecated warning + * Fri Dec 13 2024 wenweijian - 3.3.6-7 - Add huawei repository -- Gitee