updated to 22+36

tmp comment out of ea exit 17
This commit is contained in:
Jiri Vanek 2024-02-16 17:52:24 +01:00
parent 0ef00754c6
commit a1b4ddc797
4 changed files with 12 additions and 7 deletions

1
.gitignore vendored
View File

@ -42,3 +42,4 @@
/openjdk-21.0.2+12.tar.xz
/openjdk-21.0.2+13.tar.xz
/openjdk-22+32-ea.tar.xz
/openjdk-jdk-22+36-ea.tar.xz

View File

@ -35,8 +35,8 @@
# VERSION, e.g.:
#
# PROJECT_NAME=openjdk
# REPO_NAME=jdk17u
# VERSION=jdk-17.0.10+7
# REPO_NAME=jdk22u
# VERSION=jdk-22+36
#
# or to e.g., prepare systemtap, icedtea7's jstack and other tapsets:
#

View File

@ -397,8 +397,8 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 32
%global rpmrelease 2
%global buildver 36
%global rpmrelease 1
#%%global tagsuffix %%{nil}
# 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
@ -601,7 +601,7 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv
URL: http://openjdk.java.net/
# The source tarball, generated using generate_source_tarball.sh
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/openjdk-%{vcstag}%{ea_designator_zip}.tar.xz
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
@ -1023,7 +1023,7 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
echo "WARNING: Designator mismatch";
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
exit 17
#exit 17
fi
# Systemtap is processed in rpms
@ -1780,6 +1780,10 @@ done
%endif
%changelog
* Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-1.rolling
- updated to 22+36
- tmp comment out of ea exit 17
* Wed Jan 24 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.32-2.rolling
- Move to -P<n> usage for patch macro which works on all RPM versions
- generate_source_tarball.sh: Add note on network usage of OPENJDK_LATEST

View File

@ -1 +1 @@
SHA512 (openjdk-22+32-ea.tar.xz) = bbe17240a557de6d209a1398b0108d0542fa29022ae04b1f26962ec230c0764e1a5bf979e07367ef32ec5e5fa2c0cbf21e408861240d32a81fe51df35c67a553
SHA512 (openjdk-jdk-22+36-ea.tar.xz) = ecc6e6b6fd10eb6c16d9eba03fe4dbf5f5b5406b166e0e24d9d4b8e339d148da4a7b551e5669f7c9327821837988696990886e55f1045ea20b54bb1ac6ef0fc6