diff --git a/huawei-remove-provides-in-kaeprovider-module-info.patch b/huawei-remove-provides-in-kaeprovider-module-info.patch new file mode 100644 index 0000000000000000000000000000000000000000..4349e465669d1a7c9b21bc3994d3b8905e465da8 --- /dev/null +++ b/huawei-remove-provides-in-kaeprovider-module-info.patch @@ -0,0 +1,19 @@ +Subject: [PATCH] remove provides in kaeprovider module info + +--- + src/jdk.crypto.kaeprovider/linux/classes/module-info.java | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/jdk.crypto.kaeprovider/linux/classes/module-info.java b/src/jdk.crypto.kaeprovider/linux/classes/module-info.java +index 87b29bdf9..913223bb7 100644 +--- a/src/jdk.crypto.kaeprovider/linux/classes/module-info.java ++++ b/src/jdk.crypto.kaeprovider/linux/classes/module-info.java +@@ -35,5 +35,4 @@ module jdk.crypto.kaeprovider { + requires jdk.crypto.ec; + + exports org.openeuler.security.openssl to java.base; +- provides java.security.Provider with org.openeuler.security.openssl.KAEProvider; + } +-- +2.34.1 + diff --git a/openjdk-11.spec b/openjdk-11.spec index b2593ba44511248aad9404274cb2d9625d007ca6..0ac20014392a080ad47f7365f760d877cf76978e 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 @@ -913,6 +913,9 @@ Patch96: add-jbolt-feature.patch Patch97: fix-potential-build-fail-in-jbolt.patch Patch99: huawei-AArch64-Incorrect-matching-rule.patch +# 11.0.27 +Patch100: huawei-remove-provides-in-kaeprovider-module-info.patch + ############################################ # # riscv64 specific patches @@ -1216,6 +1219,7 @@ pushd %{top_level_dir_name} %patch96 -p1 %patch97 -p1 %patch99 -p1 +%patch100 -p1 %endif %endif %ifarch loongarch64 @@ -1753,6 +1757,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Thu Jul 17 2025 Benshuai5D -1:11.0.28.6-1 +- add huawei-remove-provides-in-kaeprovider-module-info.patch + * Tue Jul 15 2025 yangyingqing -1:11.0.28.6-0 - update to 11.0.28+6(GA) - delete 8352716-tz-Update-Timezone-Data-to-2025b.patch