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

Related: RHEL-32398
This commit is contained in:
Andrew Hughes 2025-07-04 19:01:25 +01:00
parent e316786e4a
commit 1086a327a1

View File

@ -343,7 +343,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27 # eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
%global rpmrelease 2 %global rpmrelease 3
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 2 %global portablerelease 2
%global portablesuffix el8 %global portablesuffix el8
@ -1281,7 +1281,7 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# Equivalent for the portable build # Equivalent for the portable build
# Hack to use a later version on RHEL while CentOS and RHEL are out of sync # Hack to use a later version on RHEL while CentOS and RHEL are out of sync
%if 0%{?centos} == 0 %if 0%{?centos} == 0
%global pversion 1.8.0.452.b09 %global pversion 1.8.0.462.b08
%global prelease 1 %global prelease 1
%else %else
%global pversion %{version} %global pversion %{version}
@ -2281,7 +2281,7 @@ if ! echo $suffix | grep -q "debug" ; then
built_doc_archive=jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip built_doc_archive=jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip
%if 0%{?centos} == 0 %if 0%{?centos} == 0
# Hack to use a later version on RHEL while CentOS and RHEL are out of sync # 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 %endif
cp -a ${docdir}/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip cp -a ${docdir}/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
fi fi
@ -2665,6 +2665,10 @@ cjc.mainProgram(args)
%endif %endif
%changelog %changelog
* Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-3
- Bump rpmrelease for CentOS build and update RHEL version hack following July 2025 update
- Related: RHEL-32398
* Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-2 * Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-2
- Update to shenandoah-jdk8u412-b08 (GA) - Update to shenandoah-jdk8u412-b08 (GA)
- Switch to GA mode. - Switch to GA mode.