|
|
|
@ -388,12 +388,7 @@
|
|
|
|
%global rpmrelease 2
|
|
|
|
%global rpmrelease 2
|
|
|
|
# Settings used by the portable build
|
|
|
|
# Settings used by the portable build
|
|
|
|
%global portablerelease 1
|
|
|
|
%global portablerelease 1
|
|
|
|
# Portable suffix differs between RHEL and CentOS
|
|
|
|
|
|
|
|
%if 0%{?centos} == 0
|
|
|
|
|
|
|
|
%global portablesuffix el8
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
%global portablesuffix el9
|
|
|
|
%global portablesuffix el9
|
|
|
|
%endif
|
|
|
|
|
|
|
|
%global portablebuilddir /builddir/build/BUILD
|
|
|
|
%global portablebuilddir /builddir/build/BUILD
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
# 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
|
|
|
|
@ -1260,7 +1255,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
|
|
|
|
|
|
Name: java-%{javaver}-%{origin}
|
|
|
|
Name: java-%{javaver}-%{origin}
|
|
|
|
Version: %{newjavaver}.%{buildver}
|
|
|
|
Version: %{newjavaver}.%{buildver}
|
|
|
|
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
|
|
|
|
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.inferit
|
|
|
|
# Equivalent for the portable build
|
|
|
|
# Equivalent for the portable build
|
|
|
|
%global prelease %{?eaprefix}%{portablerelease}%{?extraver}
|
|
|
|
%global prelease %{?eaprefix}%{portablerelease}%{?extraver}
|
|
|
|
# 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
|
|
|
|
@ -2818,6 +2813,9 @@ cjc.mainProgram(args)
|
|
|
|
- Introduce vm_variant global for consistency with future JDK builds
|
|
|
|
- Introduce vm_variant global for consistency with future JDK builds
|
|
|
|
- Related: rhbz#2203412
|
|
|
|
- Related: rhbz#2203412
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jun 15 2023 Alexey Lyubimov <a.lyubimov@msvsphere.ru> - 1:17.0.7.0.7-3.1.inferit
|
|
|
|
|
|
|
|
- Change portablesuffix
|
|
|
|
|
|
|
|
|
|
|
|
* Mon May 15 2023 Jiri Vanek <jvanek@redhat.com> - 1:17.0.7.0.7-4
|
|
|
|
* Mon May 15 2023 Jiri Vanek <jvanek@redhat.com> - 1:17.0.7.0.7-4
|
|
|
|
- Exclude classes_nocoops.jsa on i686 and arm32
|
|
|
|
- Exclude classes_nocoops.jsa on i686 and arm32
|
|
|
|
- Related: rhbz#2203412
|
|
|
|
- Related: rhbz#2203412
|
|
|
|
@ -2862,6 +2860,9 @@ cjc.mainProgram(args)
|
|
|
|
- Replace local copies of JDK portable binaries with build dependencies
|
|
|
|
- Replace local copies of JDK portable binaries with build dependencies
|
|
|
|
- Resolves: rhbz#2189326
|
|
|
|
- Resolves: rhbz#2189326
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1:17.0.6.0.10-4
|
|
|
|
|
|
|
|
- Rebuilt for MSVSphere 9.1.
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Feb 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.6.0.10-4
|
|
|
|
* Wed Feb 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.6.0.10-4
|
|
|
|
- Replace build section with extraction of existing builds from portables
|
|
|
|
- Replace build section with extraction of existing builds from portables
|
|
|
|
- Resolves: rhbz#2150200
|
|
|
|
- Resolves: rhbz#2150200
|
|
|
|
|
