From a964718bd6594b160498b5f691129c3ca8d1ca08 Mon Sep 17 00:00:00 2001 From: Benshuai5D Date: Wed, 21 May 2025 15:50:20 +0800 Subject: [PATCH] sync master to openEuler-22.03-LTS-SP3 --- openjdk-11.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openjdk-11.spec b/openjdk-11.spec index 8d0887a..28b0ddc 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 0 +Release: 1 # 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 @@ -911,6 +911,7 @@ Patch94: change-ActivePrcoessorCount-only-for-HBase.patch # 11.0.26 Patch96: add-jbolt-feature.patch Patch97: fix-potential-build-fail-in-jbolt.patch +Patch98: 8352716-tz-Update-Timezone-Data-to-2025b.patch ############################################ # @@ -1214,6 +1215,7 @@ pushd %{top_level_dir_name} %patch94 -p1 %patch96 -p1 %patch97 -p1 +%patch98 -p1 %endif %endif %ifarch loongarch64 @@ -1751,6 +1753,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Tue Apr 29 2025 wulongyao - 1:11.0.27.6-1 +- add 8352716-tz-Update-Timezone-Data-to-2025b.patch + * Thu Apr 17 2025 yangyingqing - 1:11.0.27.6-0 - update to 11.0.27+6(GA) - delete 8347965-tz-Update-Timezone-Data-to-2025a.patch -- Gitee