!22 [sync] PR-21: fix build error for loongarch64

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia, @cherry530 
Signed-off-by: @caodongxia, @cherry530

0003-add-loongarch64-support-for-os-maven-plugin.patch

@@ -1,39 +1,40 @@
-From 040a7b1eab99f49291c9b93432dfad36d6c338a2 Mon Sep 17 00:00:00 2001
+From e5901cf57b82eec8973e78b3c472118d4771a0f4 Mon Sep 17 00:00:00 2001
 From: Wenlong Zhang <zhangwenlong@loongson.cn>
-Date: Mon, 5 Feb 2024 15:11:27 +0800
+Date: Wed, 27 Mar 2024 08:41:40 +0000
 Subject: [PATCH] add loongarch64 support for os-maven-plugin
 
 ---
  README.md                                    | 1 +
- src/main/java/kr/motd/maven/os/Detector.java | 3 +++
+ src/main/java/kr/motd/maven/os/Detector.java | 4 +++-
- 2 files changed, 4 insertions(+)
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/README.md b/README.md
-index 8483a7d..a185b87 100644
+index 98f2c4e..6e2be2a 100644
 --- a/README.md
 +++ b/README.md
-@@ -37,6 +37,7 @@
+@@ -38,6 +38,7 @@
- * `ppcle_64` - if the value is `ppc64le`
  * `s390_32` - if the value is `s390`
  * `s390_64` if the value is `s390x`
+ * `riscv64` if the value is `riscv64`
 +* `loongarch_64` if the value is `loongarch_64`
  
  #### Property: `os.detected.version.*`
  
 diff --git a/src/main/java/kr/motd/maven/os/Detector.java b/src/main/java/kr/motd/maven/os/Detector.java
-index 8962f51..2c48f8e 100644
+index 3c189ff..eaf8197 100644
 --- a/src/main/java/kr/motd/maven/os/Detector.java
 +++ b/src/main/java/kr/motd/maven/os/Detector.java
-@@ -206,6 +206,9 @@ public abstract class Detector {
+@@ -209,7 +209,9 @@ public abstract class Detector {
-         if ("s390x".equals(value)) {
+         if ("riscv64".equals(value)) {
-             return "s390_64";
+             return "riscv64";
  	}
+-
 +	if ("loongarch64".equals(value)) {
 +            return "loongarch64";
 +	}
- 
          return UNKNOWN;
      }
--- 
+ 
-2.33.0
+-- 
+2.43.0
 

os-maven-plugin.spec

@@ -2,7 +2,7 @@
 
 Name:                os-maven-plugin
 version:             1.5.0
-Release:             1
+Release:             2
 Summary:             Maven plugin for generating platform-dependent properties
 License:             ASL 2.0
 URL:                 https://github.com/trustin/os-maven-plugin/
@@ -10,8 +10,8 @@ BuildArch:           noarch
 Source0:             https://github.com/trustin/%{name}/archive/refs/tags/%{name}-%{version}.Final.tar.gz
 
 Patch0:              0001-Port-to-current-plexus-utils.patch
-Patch1:              0001-add-loongarch64-support-for-os-maven-plugin.patch
+Patch1:              0002-Add_support_for_RISC-V_arch.patch
-Patch2:              0003-Add_support_for_RISC-V_arch.patch
+Patch2:              0003-add-loongarch64-support-for-os-maven-plugin.patch
 
 BuildRequires:       maven-local mvn(junit:junit) mvn(org.apache.maven:maven-core)
 BuildRequires:       mvn(org.apache.maven:maven-plugin-api)
@@ -41,9 +41,7 @@ This package provides %{summary}.
 %prep
 %setup -n %{name}-%{name}-%{version}.%{vertag}
 %patch0 -p1
-%if 0%(test `uname -m` == "loongarch64" && echo 1)
 %patch1 -p1
-%endif
 %patch2 -p1
 
 
@@ -70,6 +68,9 @@ find -name plugin.xml -delete
 %doc LICENSE.txt
 
 %changelog
+* Wed Mar 27 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.5.0-2
+- fix build error for loongarch64
+
 * Mon Feb 05 2024 Ge Wang <wang__ge@126.com> - 1.5.0-1
 - Update to version 1.5.0