Fridrich Strba 2024-02-12 08:13:35 +00:00 committed by Git OBS Bridge
parent 48acf5c4c1
commit a240f637c3
9 changed files with 40 additions and 36 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c0d67c648c03a42f341246ce59e36d6261e0d9ceda9dbe7669d7f1dcc00afd9
size 169042914

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:362c7d81038da6a47944af999d90a752bb0537faa415e54c7fa8e500f4ef0476
size 29046616

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c6d6a59cc2931766a18ca8a16b01efb61f6d73f349727b6081c227539203366d
size 169010878

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1768342a83cf4178cabe156979687c4100195dd7c9da140f7e201bd232eaa14
size 29079664

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76e32d13b55d19a59ef19b5a23c68973a134cc6955b579fc88e78eea7ff7640a
size 11108342

View File

@ -1,6 +1,6 @@
--- a/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java Thu Jun 28 17:49:13 2018 -0700
+++ b/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java Fri Jun 29 08:23:40 2018 +0200
@@ -74,6 +74,7 @@
--- a/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java
+++ b/src/java.base/share/classes/java/time/zone/TzdbZoneRulesProvider.java
@@ -74,6 +74,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
@ -8,7 +8,7 @@
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -106,7 +107,14 @@
@@ -106,7 +107,14 @@ final class TzdbZoneRulesProvider extends ZoneRulesProvider {
*/
public TzdbZoneRulesProvider() {
try {
@ -24,7 +24,7 @@
try (DataInputStream dis = new DataInputStream(
new BufferedInputStream(new FileInputStream(
new File(libDir, "tzdb.dat"))))) {
@@ -117,6 +125,28 @@
@@ -117,6 +125,28 @@ final class TzdbZoneRulesProvider extends ZoneRulesProvider {
}
}
@ -53,9 +53,9 @@
@Override
protected Set<String> provideZoneIds() {
return new HashSet<>(regionIds);
--- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java Thu Jun 28 17:49:13 2018 -0700
+++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java Fri Jun 29 08:23:40 2018 +0200
@@ -45,6 +45,7 @@
--- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
+++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
@@ -45,6 +45,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@ -63,7 +63,7 @@
import java.util.SimpleTimeZone;
import java.util.concurrent.ConcurrentHashMap;
import java.util.zip.CRC32;
@@ -251,7 +252,15 @@
@@ -252,7 +253,15 @@ public final class ZoneInfoFile {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
try {
@ -80,7 +80,7 @@
try (DataInputStream dis = new DataInputStream(
new BufferedInputStream(new FileInputStream(
new File(libDir, "tzdb.dat"))))) {
@@ -265,6 +274,28 @@
@@ -266,6 +275,28 @@ public final class ZoneInfoFile {
});
}

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3a8bdda984f663ca9da0b966b2e3a810ea511617e4f451ea2afc8a3e53f93e4
size 11118810

View File

@ -1,7 +1,7 @@
#
# spec file
# spec file for package java-17-openj9
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -29,18 +29,18 @@
# Standard JPackage naming and versioning defines.
%global featurever 17
%global interimver 0
%global updatever 9
%global buildver 9
%global updatever 10
%global buildver 7
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive
%global root_revision 3699725139c9bcbb2b83e881dac99266e080073e
%global root_branch v0.41.0-release
%global root_revision 2aad089841f6f906d5953c7c0755a0de5d9ff2e0
%global root_branch v0.43.0-release
%global omr_repository https://github.com/eclipse/openj9-omr/archive
%global omr_revision 5eee6ad9d0969d938892cd186056ae66912c7a61
%global omr_branch v0.41.0-release
%global omr_revision ea8124dbc1b625da6f607b66d2b657dce90c96c4
%global omr_branch v0.43.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision 461bf3c70bd87f1bc8422214cdb5c6c3a0ae4ff1
%global openj9_branch v0.41.0-release
%global openj9_tag openj9-0.41.0
%global openj9_revision 2c3d78b48adf36dbbef5852b95889da5a5ce1279
%global openj9_branch v0.43.0-release
%global openj9_tag openj9-0.43.0
# priority must be 6 digits in total
%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
%global priority 2701
@ -241,7 +241,7 @@ Requires(post): java-ca-certificates
# Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall tool update-alternatives.
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Recommends: tzdata-java8
Obsoletes: %{name}-accessibility
%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
@ -282,7 +282,7 @@ Requires: %{name} = %{version}-%{release}
# Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall tool update-alternatives.
Requires(postun):update-alternatives
Requires(postun): update-alternatives
%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
# Standard JPackage devel provides.
Provides: java-%{javaver}-devel = %{version}
@ -333,7 +333,7 @@ Requires: jpackage-utils
# Post requires update-alternatives to install javadoc alternative.
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall javadoc alternative.
Requires(postun):update-alternatives
Requires(postun): update-alternatives
BuildArch: noarch
%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
# Standard JPackage javadoc provides.

View File

@ -1,6 +1,6 @@
--- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk
@@ -40,11 +40,11 @@ VersionPairs :=
@@ -41,11 +41,11 @@ VersionPairs :=
# ----------
# $1 - repository display name
# $2 - variable name
@ -14,7 +14,7 @@
ifneq (,$$($2))
VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }")
VersionPairs += "$1" "$$($2)"
@@ -60,17 +60,16 @@ define ShowVersions
@@ -61,17 +61,16 @@ define ShowVersions
@$(PRINTF) " %-$(VersionLabelWidth)s - %s\n" $(VersionPairs)
endef # ShowVersions
@ -39,7 +39,7 @@
endif
--- a/closed/custom/ReleaseFile.gmk
+++ b/closed/custom/ReleaseFile.gmk
@@ -18,6 +18,6 @@
@@ -18,9 +18,9 @@
# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
# ===========================================================================
@ -49,3 +49,7 @@
+SOURCE_REVISION := OpenJDK:@OPENJ9_SHA@
+SOURCE_REVISION += OpenJ9:@OPENJ9_SHA@
+SOURCE_REVISION += OMR:@OPENJ9OMR_SHA@
ifeq (true,$(BUILD_OPENJCEPLUS))
- SOURCE_REVISION += OpenJCEPlus:$(shell $(GIT) -C $(OPENJCEPLUS_TOPDIR) rev-parse --short HEAD)
+ SOURCE_REVISION += OpenJCEPlus:@OPENJCEPLUS_SHA@
endif