sync master to openEuler-24.03-LTS
This commit is contained in:
parent
29ad0c87f6
commit
b78f2765ae
File diff suppressed because it is too large
Load Diff
@ -367,4 +367,4 @@ index 000000000..85b49171c
|
||||
--- /dev/null
|
||||
+++ b/version.txt
|
||||
@@ -0,0 +1 @@
|
||||
+11.0.25.0.13
|
||||
+11.0.26.0.13
|
||||
|
||||
Binary file not shown.
@ -128,7 +128,7 @@
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global majorver 11
|
||||
%global securityver 25
|
||||
%global securityver 26
|
||||
# buildjdkver is usually same as %%{majorver},
|
||||
# but in time of bootstrap of next jdk, it is majorver-1,
|
||||
# and this it is better to change it here, on single place
|
||||
@ -149,12 +149,12 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 9
|
||||
%global buildver 4
|
||||
%global patchver 0
|
||||
|
||||
%global project jdk-updates
|
||||
%global repo jdk11u
|
||||
%global revision jdk-11.0.25-ga
|
||||
%global revision jdk-11.0.26-ga
|
||||
%global full_revision %{project}-%{repo}-%{revision}
|
||||
# priority must be 7 digits in total
|
||||
# setting to 1, so debug ones can have 0
|
||||
@ -768,7 +768,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: 3
|
||||
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
|
||||
@ -1715,6 +1715,16 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 12 2025 Dingli Zhang <dingli@iscas.ac.cn> - 1:11.0.26.4-1
|
||||
- update riscv64 port to 11.0.26
|
||||
|
||||
* Wed Jan 22 2025 Autistic_boyya <wangzhongyi7@huawei.com> - 1:11.0.26.4-0
|
||||
- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
|
||||
|
||||
* Fri Dec 27 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:11.0.25.9-4
|
||||
- Fix build error on docker for riscv64
|
||||
- Fix bogus date in changelog
|
||||
|
||||
* Wed Nov 6 2024 Pan Xuefeng <panxuefeng@loongson.cn> - 1:11.0.25.9-3
|
||||
- update LoongArch64 port to 11.0.25
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user