rpms/java-1.8.0-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Bump rpmrelease for CentOS build

Browse Source 
- Remove obsolete hack to hardcode newer portable version on RHEL

Related: RHEL-101655
Related: RHEL-102306
Related: RHEL-102908
This commit is contained in:
Andrew Hughes 2025-07-04 19:01:25 +01:00
parent 9eaa285aa9
commit ae9574445f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java-1.8.0-openjdk.spec
View File

@ -346,7 +346,7 @@
# eg jdk8u60-b27 -> b27 # eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
# rpmrelease numbering must start at 2 to be later than the 8.6 RPM # rpmrelease numbering must start at 2 to be later than the 8.6 RPM
%global rpmrelease 2 %global rpmrelease 3
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %global portablerelease 1
%global portablerhel 8 %global portablerhel 8
@ -1295,14 +1295,8 @@ Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} 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
%if 0%{?centos} == 0
%global pversion 1.8.0.462.b08
%global prelease 1
%else
%global pversion %{version} %global pversion %{version}
%global prelease %{?eaprefix}%{portablerelease}%{?extraver} %global prelease %{?eaprefix}%{portablerelease}%{?extraver}
%endif
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -2335,10 +2329,6 @@ if ! echo $suffix | grep -q "debug" ; then
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a ${docdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} cp -a ${docdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
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
# Hack to use a later version on RHEL while CentOS and RHEL are out of sync
built_doc_archive=jdk-%{javaver}_462-b08-docs.zip
%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
@ -2721,6 +2711,13 @@ cjc.mainProgram(args)
%endif %endif
%changelog %changelog
* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.462.b08-4
- Bump rpmrelease for CentOS build
- Remove obsolete hack to hardcode newer portable version on RHEL
- Related: RHEL-101655
- Related: RHEL-102306
- Related: RHEL-102908
* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.462.b08-2 * Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.462.b08-2
- Update to 8u462-b08 (GA) - Update to 8u462-b08 (GA)
- Update release notes for 8u462-b08. - Update release notes for 8u462-b08.