diff --git a/jdk-jdk18-jdk-18+37.tar.gz b/jdk-updates-jdk18u-jdk-18.0.1+10.tar.gz similarity index 99% rename from jdk-jdk18-jdk-18+37.tar.gz rename to jdk-updates-jdk18u-jdk-18.0.1+10.tar.gz index 29e4de80fa7eb312f198aa21e1a2b445e8fce83a..e754e114d32cff1b4a283cc02aa8fdf6b3198cd1 100644 Binary files a/jdk-jdk18-jdk-18+37.tar.gz and b/jdk-updates-jdk18u-jdk-18.0.1+10.tar.gz differ diff --git a/openjdk-latest.spec b/openjdk-latest.spec index f39f39042609399563c0ac041f9104375b589078..8668c5e701fba2ed1efa5fb5fa85e1ce227d0885 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -155,11 +155,11 @@ # Used via new version scheme. JDK 18 was # GA'ed in March 2022 => 22.3 %global vendor_version_string 22.3 -%global securityver 0 +%global securityver 1 # 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 -%global buildjdkver 17 +%global buildjdkver 18 # We don't add any LTS designator for STS packages (Fedora and EPEL). # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. %if 0%{?rhel} && !0%{?epel} @@ -175,7 +175,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 37 +%global buildver 10 %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 @@ -928,7 +928,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-jdk%{majorver}-jdk-%{filever}+%{buildver}.tar.gz +Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1754,6 +1754,12 @@ cjc.mainProgram(arg) %changelog +* Sat May 7 2022 noah - 1:18.0.1.10-0-rolling +- Update to jdk-18.0.1+10 + +* Thu May 5 2022 noah - 1:18.0.0.37-1.rolling +- set build jdk to 18 + * Tue Apr 26 2022 noah - 1:18.0.0.37-0.0.ea.rolling - Update to jdk-18.0.0.0+37 - adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch