From 61bcf90dc176801522052ab85f2ab984bf283e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E4=BB=B2=E4=BC=9F?= Date: Wed, 11 Dec 2024 17:13:22 +0800 Subject: [PATCH] include all patches in the source package. --- hadoop.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hadoop.spec b/hadoop.spec index 8b5c739..283d7d8 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -11,7 +11,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop Version: 3.3.6 -Release: 6 +Release: 7 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -45,11 +45,9 @@ Patch1: 02-Upgrade-os-maven-plugin-to-1.7.1.patch Patch2: 03-Fix-build-on-riscv.patch Patch3: 04-Enhance-access-control-for-RunJar.patch -%ifarch riscv64 Patch1000: 1000-Added-support-for-building-the-riscv64-protoc-binari.patch Patch1001: 1001-Added-support-for-building-the-riscv64-protoc-gen-gr.patch Patch1002: 1002-Added-support-for-building-the-riscv64-protoc-binari.patch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel @@ -307,7 +305,8 @@ mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dver %patch1 -p1 %patch2 -p1 %else -%autosetup -p1 -n %{name}-%{version}-src +%setup -n %{name}-%{version}-src +%autopatch -M999 -p1 %endif mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar @@ -1203,6 +1202,9 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Tue Dec 10 2024 shenzhongwei - 3.3.6-7 +- include all patches in the source package. + * Mon Nov 11 2024 xiaochn - 3.3.6-6 - Remove npm repo in spec file and use unified configuration of the build environment -- Gitee