From fbdbdf7d8d6ba6e81b7df6cc17ff8e03ca9b1985 Mon Sep 17 00:00:00 2001 From: ouyangminxiang Date: Tue, 12 Apr 2022 10:36:43 +0800 Subject: [PATCH] add some translation of openjdk and support noarch for srpm build --- openjdk-1.8.0.spec | 12 +++++++++++- policytool.desktop.in | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index fe4227c..e0e5678 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -116,6 +116,12 @@ %global stapinstall arm64 %endif +# Need to support noarch for srpm build +%ifarch noarch +%global archinstall %{nil} +%global stapinstall %{nil} +%endif + %ifarch %{jit_arches} %global with_systemtap 1 %else @@ -916,7 +922,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 4 +Release: 5 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -2238,6 +2244,10 @@ cjc.mainProgram(arg) %endif %changelog +* Mon Mar 21 2022 ouyangminxiang - 1:1.8.0.322-b06.5 +- fix some translation of openjdk +- support noarch for srpm build + * Wed Mar 2 2022 kuenking111 - 1:1.8.0.322-b06.4 - add 8268819-SA-Remove-libthread_db-dependency-on-Linux.patch diff --git a/policytool.desktop.in b/policytool.desktop.in index 5f4cb4a..e3ab2f1 100644 --- a/policytool.desktop.in +++ b/policytool.desktop.in @@ -1,6 +1,8 @@ [Desktop Entry] Name=OpenJDK @JAVA_VER@ for @target_cpu@ Policy Tool (@OPENJDK_VER@) +Name[zh_CN]=OpenJDK策略工具 Comment=Manage OpenJDK policy files +Comment[zh_CN]=管理OpenJDK策略文件 Exec=_JREBINDIR_/policytool Icon=java-@JAVA_VER@-@JAVA_VENDOR@ Terminal=false -- Gitee