diff --git a/hadoop.spec b/hadoop.spec index 4b932ae9e9c55238eeb40853af763ea891b07cc7..b189a41391f43aa83c653179dcaad37cf2f5c69d 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 @@ -47,11 +47,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 @@ -309,7 +307,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 @@ -1207,6 +1206,9 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Mon Dec 16 2024 shenzhongwei - 3.3.6-8 +- include all patches in the source package. + * Fri Dec 13 2024 wenweijian - 3.3.6-7 - Add huawei repository