From 527dc6fed93e788916cd74adb540b547df2956a8 Mon Sep 17 00:00:00 2001 From: cherry530 <707078654@qq.com> Date: Thu, 7 Mar 2024 17:31:29 +0800 Subject: [PATCH] fix the architecture cannot be identified causes failure Signed-off-by: cherry530 <707078654@qq.com> (cherry picked from commit 10fed658f7f58ca12707a783a0be291abc697789) --- ...C-V_arch.patch => Add_support_for_RISC-V_arch.patch | 0 ...nown-arch.patch => Don-t-fail-on-unknown-arch.patch | 0 ...s-utils.patch => Port-to-current-plexus-utils.patch | 0 os-maven-plugin.spec | 10 +++++++--- 4 files changed, 7 insertions(+), 3 deletions(-) rename 0003-Add_support_for_RISC-V_arch.patch => Add_support_for_RISC-V_arch.patch (100%) rename 0002-Don-t-fail-on-unknown-arch.patch => Don-t-fail-on-unknown-arch.patch (100%) rename 0001-Port-to-current-plexus-utils.patch => Port-to-current-plexus-utils.patch (100%) diff --git a/0003-Add_support_for_RISC-V_arch.patch b/Add_support_for_RISC-V_arch.patch similarity index 100% rename from 0003-Add_support_for_RISC-V_arch.patch rename to Add_support_for_RISC-V_arch.patch diff --git a/0002-Don-t-fail-on-unknown-arch.patch b/Don-t-fail-on-unknown-arch.patch similarity index 100% rename from 0002-Don-t-fail-on-unknown-arch.patch rename to Don-t-fail-on-unknown-arch.patch diff --git a/0001-Port-to-current-plexus-utils.patch b/Port-to-current-plexus-utils.patch similarity index 100% rename from 0001-Port-to-current-plexus-utils.patch rename to Port-to-current-plexus-utils.patch diff --git a/os-maven-plugin.spec b/os-maven-plugin.spec index f6e0fc0..87a03a8 100644 --- a/os-maven-plugin.spec +++ b/os-maven-plugin.spec @@ -2,15 +2,16 @@ Name: os-maven-plugin Version: 1.2.3 -Release: 2 +Release: 3 Summary: Maven plugin for generating platform-dependent properties License: ASL 2.0 URL: https://github.com/trustin/os-maven-plugin/ BuildArch: noarch Source0: https://github.com/trustin/%{name}/archive/%{name}-%{version}.Final.tar.gz -Patch0: 0001-Port-to-current-plexus-utils.patch -Patch1: 0003-Add_support_for_RISC-V_arch.patch +Patch0: Port-to-current-plexus-utils.patch +Patch1: Add_support_for_RISC-V_arch.patch +Patch2: Don-t-fail-on-unknown-arch.patch BuildRequires: maven-local mvn(junit:junit) mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) @@ -60,6 +61,9 @@ find -name plugin.xml -delete %doc LICENSE.txt %changelog +* Thu Mar 07 2024 xu_ping<707078654@qq.com> - 1.2.3-3 +- fix the architecture cannot be identified causes failure + * Mon Jun 26 2023 xiaoqian lv - 1.2.3-2 - Add support for RISC-V arch