diff --git a/jdk-updates-jdk21u-jdk-21.0.2+12.tar.gz b/jdk-updates-jdk21u-jdk-21.0.2+12.tar.gz deleted file mode 100644 index 80b9f788639b699baffa4e3d00e53497cbe9587f..0000000000000000000000000000000000000000 Binary files a/jdk-updates-jdk21u-jdk-21.0.2+12.tar.gz and /dev/null differ diff --git a/jdk-updates-jdk21u-jdk-21.0.3+9.tar.gz b/jdk-updates-jdk21u-jdk-21.0.4+7.tar.gz similarity index 82% rename from jdk-updates-jdk21u-jdk-21.0.3+9.tar.gz rename to jdk-updates-jdk21u-jdk-21.0.4+7.tar.gz index a2b9d8e94ec2831200584704e6e07f0a98717a6c..17a24f498b2b503670f6687d067e75ab331833bd 100644 Binary files a/jdk-updates-jdk21u-jdk-21.0.3+9.tar.gz and b/jdk-updates-jdk21u-jdk-21.0.4+7.tar.gz differ diff --git a/openjdk-21.spec b/openjdk-21.spec index 7478c36d4d38e29ca874881021e2a60fb88e1f36..e3f3622678afe1e4afa17581bf9b1ddc4cd79df6 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -158,7 +158,7 @@ # Used via new version scheme. JDK 19 was # GA'ed in March 2022 => 22.3 %global vendor_version_string BiSheng -%global securityver 3 +%global securityver 4 # 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 @@ -178,7 +178,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 9 +%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 @@ -897,7 +897,7 @@ Name: java-21-%{origin} Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -Release: 5 +Release: 0 # 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 @@ -1207,7 +1207,7 @@ fi # OpenJDK patches # Remove libraries that are linked -sh %{SOURCE12} +# sh %{SOURCE12} %ifnarch loongarch64 pushd %{top_level_dir_name} %patch1 -p1 @@ -1793,6 +1793,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Thu Jul 18 2024 Autistic_boyya -1:21.0.4.7-rolling +- update to jdk21.0.4-ga + * Tue Jul 16 2024 zhaosaisai - 1:21.0.3.9-5 - change to depend on the specific version