diff --git a/openjdk-11.spec b/openjdk-11.spec index fbb5caeec0d122a57f92df77a7a019eb006c2f79..0be863b71b7dd99256a1b0da7c55a71d31c0c48d 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -131,7 +131,12 @@ # and this it is better to change it here, on single place %global buildjdkver %{majorver} +%ifnarch loongarch64 ppc64le %global vendor_version_string Bisheng +%endif +%ifarch loongarch64 +%global vendor_version_string Loongson +%endif # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 3.15.0 @@ -757,7 +762,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 2 +Release: 3 # 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 @@ -1302,9 +1307,12 @@ bash ../configure \ --with-version-build=%{buildver} \ --with-version-pre="" \ --with-version-opt="" \ -%ifnarch loongarch64 ppc64le --with-vendor-version-string="%{vendor_version_string}" \ +%ifnarch loongarch64 ppc64le --with-vendor-name="Bisheng" \ +%endif +%ifarch loongarch64 + --with-vendor-name="Loongson" \ %endif --with-vendor-url="https://openeuler.org/" \ --with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \ @@ -1725,10 +1733,14 @@ cjc.mainProgram(arg) %changelog -* Wed May 06 2024 zhangxianting - 1:11.0.23.9-1 +* Mon Jun 03 2024 songliyang - 1:11.0.23.9-3 +- fix loongarch vendor error +- fix changelog error + +* Wed May 08 2024 zhangxianting - 1:11.0.23.9-2 - recompress the source0 -* Mon Apr 29 2024 huangjie - 1:11.0.23.9-0 +* Mon Apr 29 2024 huangjie - 1:11.0.23.9-1 - modified delete_expired_certificates.patch * Thu Apr 18 2024 huangjie - 1:11.0.23.9-0 @@ -1762,15 +1774,15 @@ cjc.mainProgram(arg) * Thu Aug 17 2023 misaka00251 - 1:11.0.20.8-2 - Add riscv64 support (based on bishengjdk riscv branch) -* Wed Aug 2023 noah - 1:11.0.20.8-1 +* Wed Aug 16 2023 noah - 1:11.0.20.8-1 - fix CPUBench kmeans random fails -* Wed Jul 2023 DXwangg - 1:11.0.20.8-0 +* Tue Jul 25 2023 DXwangg - 1:11.0.20.8-0 - update to 11.0.20+8(GA) - modified delete_expired_certificates.patch -* Thu Apr 2023 DXwangg - 1:11.0.19.7-0 +* Sun Apr 23 2023 DXwangg - 1:11.0.19.7-0 - update to 11.0.19+7(GA) - deleted 8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch - modified Add-KAE-implementation.patch