jdk-17.0.6+9 .. jdk-17.0.8+7;return commit 64aaadf675

This commit is contained in:
slava86 2023-08-23 20:17:01 +03:00
parent af824a596c
commit b6c61925b3
2 changed files with 10 additions and 7 deletions

View file

@ -2,6 +2,5 @@ sources:
OpenJDK-17.0.2+8-i686-bin.tar.xz: 97814fcc206b7eab675e447887a7f1d5de88d62a
jdk-17.0.4.1_linux-aarch64_bin.tar.gz: 71e443e9ec1e3955b5b3a0df7041117450e8579d
jdk-17.0.4.1_linux-x64_bin.tar.gz: 4862b809a2d71cf3ff92639bfeb6aac0c3a92321
openjdk-jdk17u-jdk-17.0.6+1.tar.xz: 6b8dad0bc0d9c4956f664aa60e478937594a6029
openjdk-jdk17u-jdk-17.0.6+9.tar.xz: 094582b47ccbe9dcaf7e3f83aa7f4fea78adaec4
openjdk-jdk17u-jdk-17.0.8+7.tar.xz: 546b6183b99b4a2b1696ef882c6e1f8389eafcea
tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz: c8281ee37b77d535c9c1af86609a531958ff7b34

View file

@ -117,6 +117,10 @@
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
%global is_system_jdk 1
# XXX ROSA-specific: commit 6dab1797 accidently put is_system_jdk=1 instead of 0,
# now leaving java 11 with this, but exclude devel provides to restore java 1.8 as default JDK and leave java 11 as default JRE
%global devel_provides 0
%global aarch64 aarch64 arm64 armv8
# we need to distinguish between big and little endian PPC64
%global ppc64le ppc64le
@ -327,7 +331,7 @@
# New Version-String scheme-style defines
%global featurever 17
%global interimver 0
%global updatever 6
%global updatever 8
%global patchver 0
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
@ -349,8 +353,8 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 9
%global rpmrelease 2
%global buildver 7
%global rpmrelease 1
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@ -376,7 +380,7 @@
# Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases,
# - N%%{?extraver}{?dist} for GA releases
%global is_ga 0
%global is_ga 1
%if %{is_ga}
%global build_type GA
%global ea_designator ""
@ -1190,7 +1194,7 @@ Provides: java-sdk-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-sdk-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-%{javaver}-devel%{?1} = %{epoch}:%{version}-%{release}
Provides: java-%{javaver}-%{origin}-devel%{?1} = %{epoch}:%{version}-%{release}
%if %is_system_jdk
%if %is_system_jdk && %{devel_provides}
Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-sdk-%{origin}%{?1} = %{epoch}:%{version}-%{release}
Provides: java-devel%{?1} = %{epoch}:%{version}-%{release}