From 40e63ef0cc2f5b06482f9cc9af226f3a71aad019 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Apr 27 2022 16:36:10 +0000 Subject: updated to CPU jdk-18.0.1 sources --- diff --git a/.gitignore b/.gitignore index 1d080d8..6aa39e8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /openjdk-jdk-jdk-18+27.tar.xz /openjdk-jdk18-jdk-18+27.tar.xz /openjdk-jdk18-jdk-18+37.tar.xz +/openjdk-jdk18u-jdk-18.0.1+0.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index 94d2fa9..fadbf69 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -8,8 +8,8 @@ # # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg: # PROJECT_NAME=openjdk -# REPO_NAME=jdk18 -# VERSION=jdk-18+37 +# REPO_NAME=jdk18u +# VERSION=jdk-18.0.1-ga # or to eg prepare systemtap: # icedtea7's jstack and other tapsets # VERSION=6327cf1cea9e diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index a61d929..3c7f6f4 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -301,7 +301,7 @@ # New Version-String scheme-style defines %global featurever 18 %global interimver 0 -%global updatever 0 +%global updatever 1 %global patchver 0 # If you bump featurever, you must also bump vendor_version_string # Used via new version scheme. JDK 17 was @@ -341,8 +341,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 37 -%global rpmrelease 4 +%global buildver 0 +%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 @@ -1268,7 +1268,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: openjdk-jdk%{featurever}-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz +Source0: openjdk-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). @@ -2533,6 +2533,9 @@ cjc.mainProgram(args) %endif %changelog +* Wed Apr 27 2022 Jiri Vanek - 1:18.0.1.0.0-1.rolling. +- updated to CPU jdk-18.0.1 sources + * Wed Apr 06 2022 Jiri Vanek - 1:18.0.0.0.37-4.rolling - Remove hardcoded /usr/lib/jvm by %{_jvmdir} to make rpmlint happy diff --git a/sources b/sources index 5c094ae..d8dd163 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-jdk18-jdk-18+37.tar.xz) = bd029f42e1a46a3a885622f4b92b739ae5b90566baaa7b1e57d0eb01473b6be1ec03eb72e02c1e4bdeb780b8ab3fd342b764cb93e93ce4e5f879209490d45645 +SHA512 (openjdk-jdk18u-jdk-18.0.1+0.tar.xz) = 633ad239bbefff4365a05cd6f12387759cbb51f2e0441a88e1d57d79f78d4874d51574e5225ad2fa21894356b1fc02c703f4272d6861d20d2adc81421c9d605b