Bump rpmrelease for CentOS build and update RHEL version hack following July 2025 update

Related: RHEL-47013
This commit is contained in:
Andrew Hughes 2025-07-04 19:01:25 +01:00
parent 7b284ff99c
commit df9e4fd813

View File

@ -363,7 +363,7 @@
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
# rpmrelease numbering must start at 2 to be later than the 9.0 RPM
%global rpmrelease 2
%global rpmrelease 3
# Settings used by the portable build
%global portablerelease 1
# Portable suffix differs between RHEL and CentOS
@ -1380,7 +1380,7 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# Equivalent for the portable build
# Hack to use a later version on RHEL while CentOS and RHEL are out of sync
%if 0%{?centos} == 0
%global pversion 1.8.0.452.b09
%global pversion 1.8.0.462.b08
%global prelease 1
%else
%global pversion %{version}
@ -2643,7 +2643,7 @@ if ! echo $suffix | grep -q "debug" ; then
%ifarch %{portable_build_arches}
%if 0%{?centos} == 0
# Hack to use a later version on RHEL while CentOS and RHEL are out of sync
built_doc_archive=jdk-%{javaver}_452-b09-docs.zip
built_doc_archive=jdk-%{javaver}_462-b08-docs.zip
%endif
cp -a ${docdir}/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
%else
@ -2937,6 +2937,10 @@ cjc.mainProgram(args)
%endif
%changelog
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b05-3
- Bump rpmrelease for CentOS build and update RHEL version hack following July 2025 update
- Related: RHEL-47013
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b05-2
- Update to shenandoah-jdk8u422-b05 (GA)
- Update release notes for shenandoah-8u422-b05.