diff --git a/jdk-jdk20-jdk-20+36.tar.gz b/jdk-jdk20-jdk-20+36.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b24d3ab6a37d87e11911405d6b32cc360df5becb Binary files /dev/null and b/jdk-jdk20-jdk-20+36.tar.gz differ diff --git a/jdk-updates-jdk19u-jdk-19.0.2+7.tar.gz b/jdk-updates-jdk19u-jdk-19.0.2+7.tar.gz deleted file mode 100644 index be4f14152a2b295099b0d59765226a34f8a2df06..0000000000000000000000000000000000000000 Binary files a/jdk-updates-jdk19u-jdk-19.0.2+7.tar.gz and /dev/null differ diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 33c213ac090e6337ade95f5cef6e6c97dc48d9d6..c4ed4f77a377fb7ca4cc609f66d5acae92e79e0b 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -151,11 +151,11 @@ # New Version-String scheme-style defines # If you bump majorver, you must bump also vendor_version_string -%global majorver 19 -# Used via new version scheme. JDK 19 was +%global majorver 20 +# Used via new version scheme. JDK 20 was # GA'ed in March 2022 => 22.3 %global vendor_version_string 22.3 -%global securityver 2 +%global securityver 0 # 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 @@ -175,7 +175,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 7 +%global buildver 36 %global rpmrelease 0 # 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 @@ -927,7 +927,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz +Source0: jdk-jdk%{majorver}-jdk-%{filever}+%{buildver}.tar.gz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -960,8 +960,6 @@ Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch # Restrict access to java-atk-wrapper classes Patch2: rh1648644-java_access_bridge_privileged_security.patch Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch -# Follow system wide crypto policy RHBZ#1249083 -Patch4: pr3183-rh1340845-support_system_crypto_policy.patch # Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch @@ -1201,7 +1199,6 @@ pushd %{top_level_dir_name} %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -1752,6 +1749,10 @@ cjc.mainProgram(arg) %changelog +* Tue May 08 2023 wanghao -1:20.0.0.36-0.0.ea.rolling +- Update to jdk-20.0.0.0+36 +- remove pr3183-rh1340845-support_system_crypto_policy.patch + * Wed Feb 1 2023 DXwangg - 1:19.0.2.7-0-rolling - Update to jdk-19.0.2+7