diff --git a/.gitignore b/.gitignore index 58da5be..2915908 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /jdk-jdk13-jdk-13+28.tar.xz /jdk-jdk13-jdk-13+33.tar.xz /jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz +/jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index a083f40..28db991 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -200,7 +200,7 @@ # New Version-String scheme-style defines %global majorver 13 -%global securityver 1 +%global securityver 2 # 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 @@ -218,8 +218,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 9 -%global rpmrelease 2 +%global buildver 8 +%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 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -1041,21 +1041,6 @@ Patch4: pr3183-rh1340845-support_fedora_rhel_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 -############################################# -# -# Patches appearing in 13.0.2 -# -# This section includes patches which are present -# in the listed OpenJDK 13u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# - -Patch7: jdk8231405-guarantee_d_nonequals_null_failed_null_dominator_info.patch -Patch8: jdk8231583-fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch - -############################################# - BuildRequires: autoconf BuildRequires: automake BuildRequires: alsa-lib-devel @@ -1281,8 +1266,6 @@ pushd %{top_level_dir_name} %patch3 -p1 %patch4 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 popd # openjdk %patch1000 @@ -1819,6 +1802,11 @@ require "copy_jdk_configs.lua" %changelog +* Fri Jan 17 2020 Petra Alice Mikova - 1:13.0.2.8-1.rolling +- removed patch jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch +- removed patch jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch +- updated sources to the 13.0.2+8 tag + * Fri Oct 25 2019 Petra Alice Mikova - 1:13.0.1.9-2.rolling - Fixed hardcoded major version in jdk13u to macro - added jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch diff --git a/sources b/sources index c966ab5..906bfd3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz) = 0f3dad5444d8ae3f2d3e239377dc8d0833ef582a69caebb703e8846d7ffe5df5c3fafb384a592b8513ff48c4ca3eac43d266831e371735c61f425173b1ff5fac +SHA512 (jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz) = b7b30b650d67705546dba4eab195a8f86fdb7c2ecdd2d2925fe8aefcf015ea00c0d4af600a7aa2f0ed26a4259f6591d645ca607c5c992c2c6fd2b756d5aac8c1 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d