Merge branch 'epel10' into epel9

This commit is contained in:
Jiri Vanek 2025-02-18 14:09:33 +01:00
commit 2e82bfc034
4 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View file

@ -49,3 +49,4 @@
/openjdk-jdk-23.0.1+11.tar.xz
/openjdk-23.0.2+7.tar.xz
/openjdk-24+34-ea.tar.xz
/openjdk-24+36.tar.xz

View file

@ -36,7 +36,7 @@
#
# PROJECT_NAME=openjdk
# REPO_NAME=jdk24u
# VERSION=jdk-24+34
# VERSION=jdk-24+36
#
# or to e.g., prepare systemtap, icedtea7's jstack and other tapsets:
#

View file

@ -342,7 +342,7 @@
# buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place
%global buildjdkver 23
%global buildjdkver 24
# 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}
@ -401,7 +401,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 34
%global buildver 36
%global rpmrelease %(echo "%autorelease" | sed 's;%{?dist};;')
#%%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
@ -421,7 +421,7 @@
# Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases,
# - N%%{?extraver}{?dist} for GA releases
%global is_ga 0
%global is_ga 1
%if %{is_ga}
%global build_type GA
%global ea_designator ""

View file

@ -1 +1 @@
SHA512 (openjdk-24+34-ea.tar.xz) = caaa8e0e6ca515a9fc18ddbcda0fd1e2a4863aee49b2a5dea77a93346112ff5c9147d57088179866fe6b3905dea3a06c225811118edb395746a478a9dd2d0039
SHA512 (openjdk-24+36.tar.xz) = cfa05667adc8484818a062e2857c7733e91060efffbfab714f391414ea943c09cd4311e055fff8c4b8862103c392c5236946cba77996c0ba4b4137bc5275557e