|
|
|
|
@ -326,7 +326,7 @@
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
|
%global featurever 17
|
|
|
|
|
%global interimver 0
|
|
|
|
|
%global updatever 12
|
|
|
|
|
%global updatever 13
|
|
|
|
|
%global patchver 0
|
|
|
|
|
# buildjdkver is usually same as %%{featurever},
|
|
|
|
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
|
|
|
|
@ -381,12 +381,17 @@
|
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
|
%global top_level_dir_name %{vcstag}
|
|
|
|
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
|
|
|
|
%global buildver 7
|
|
|
|
|
%global buildver 11
|
|
|
|
|
# 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
|
|
|
|
|
%if 0%{?centos} == 0
|
|
|
|
|
%global portablesuffix el8
|
|
|
|
|
%else
|
|
|
|
|
%global portablesuffix el9
|
|
|
|
|
%endif
|
|
|
|
|
%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
|
|
|
|
|
@ -406,7 +411,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 1
|
|
|
|
|
%global is_ga 1
|
|
|
|
|
%if %{is_ga}
|
|
|
|
|
%global build_type GA
|
|
|
|
|
%global ea_designator ""
|
|
|
|
|
@ -1412,10 +1417,6 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
|
|
|
|
|
#
|
|
|
|
|
#############################################
|
|
|
|
|
|
|
|
|
|
# https://github.com/openjdk/jdk17u-dev/commit/859dda14f3f0d90294899812f5d34ea2e952a3df
|
|
|
|
|
# Remove after next upstream update.
|
|
|
|
|
Patch7: 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
|
|
|
|
|
|
|
|
|
|
# Currently empty
|
|
|
|
|
|
|
|
|
|
BuildRequires: autoconf
|
|
|
|
|
@ -1870,7 +1871,6 @@ pushd %{top_level_dir_name}
|
|
|
|
|
# rpmbuild.
|
|
|
|
|
%patch -P1 -p1
|
|
|
|
|
%patch -P6 -p1
|
|
|
|
|
%patch -P7 -p1
|
|
|
|
|
# Add crypto policy and FIPS support
|
|
|
|
|
%patch -P1001 -p1
|
|
|
|
|
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
|
|
|
|
@ -2496,6 +2496,73 @@ cjc.mainProgram(args)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Oct 9 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.13.0.11-3
|
|
|
|
|
- Correct version suffix in "Update to jdk-17.0.13+11 (GA)" changelog entry
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
|
|
|
|
|
* Tue Oct 8 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.13.0.11-2
|
|
|
|
|
- Update to jdk-17.0.13+11 (GA)
|
|
|
|
|
- Update .gitignore to ignore openjdk-17.0.13+11.tar.xz
|
|
|
|
|
- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8
|
|
|
|
|
- Set buildver to 11
|
|
|
|
|
- Set is_ga to 1
|
|
|
|
|
- Update sources to openjdk-17.0.13+11.tar.xz
|
|
|
|
|
- Resolves: RHEL-58785
|
|
|
|
|
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Fri Oct 4 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.13.0.10-0.2.ea
|
|
|
|
|
- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
|
|
|
|
|
- Set rpmrelease to 2
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
|
|
|
|
|
* Fri Oct 4 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.13.0.10-0.1.ea
|
|
|
|
|
- Update to jdk-17.0.13+10 (EA)
|
|
|
|
|
- Update .gitignore to ignore openjdk-17.0.13+10-ea.tar.xz
|
|
|
|
|
- Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9
|
|
|
|
|
- Set buildver to 10
|
|
|
|
|
- Update sources to openjdk-17.0.13+10-ea.tar.xz
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
|
|
|
|
|
* Thu Oct 3 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.13.0.9-0.1.ea
|
|
|
|
|
- Update to jdk-17.0.13+9 (EA)
|
|
|
|
|
- Update .gitignore to ignore openjdk-17.0.13+9-ea.tar.xz
|
|
|
|
|
- Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9
|
|
|
|
|
- Set buildver to 9
|
|
|
|
|
- Set rpmrelease to 1
|
|
|
|
|
- Set portablerelease to 1
|
|
|
|
|
- Update sources to openjdk-17.0.13+9-ea.tar.xz
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
|
|
|
|
|
* Thu Oct 3 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.13.0.1-0.4.ea
|
|
|
|
|
- Set rpmrelease to 4
|
|
|
|
|
- Set portablerelease to 2
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
|
|
|
|
|
* Thu Oct 3 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.13.0.1-0.3.ea
|
|
|
|
|
- Synchronize java-17-openjdk-portable.specfile
|
|
|
|
|
- Set rpmrelease to 3
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
|
|
|
|
|
* Thu Oct 3 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.13.0.1-0.2.ea
|
|
|
|
|
- Update to jdk-17.0.13+1 (EA)
|
|
|
|
|
- Update .gitignore to ignore openjdk-17.0.13+1-ea.tar.xz
|
|
|
|
|
- Synchronize java-17-openjdk-portable.specfile
|
|
|
|
|
- Set updatever to 13
|
|
|
|
|
- Set buildver to 1
|
|
|
|
|
- Set is_ga to 0
|
|
|
|
|
- Update sources to openjdk-17.0.13+1-ea.tar.xz
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
- Remove 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
|
|
|
|
|
- Remove unicode section from rpminspect.yml, fixed instead by
|
|
|
|
|
https://gitlab.cee.redhat.com/osci/rpminspect-data-redhat/-/merge_requests/180
|
|
|
|
|
(OPENJDK-2904)
|
|
|
|
|
- Related: RHEL-58785
|
|
|
|
|
|
|
|
|
|
* Mon Sep 23 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.7-3
|
|
|
|
|
- Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9
|
|
|
|
|
- Set rpmrelease to 3
|
|
|
|
|
- Set portablesuffix to el9
|
|
|
|
|
|
|
|
|
|
* Wed Jul 10 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.7-2
|
|
|
|
|
- Update to jdk-17.0.12+7 (GA)
|
|
|
|
|
- Update .gitignore to ignore openjdk-17.0.12+7.tar.xz
|
|
|
|
|
@ -2504,8 +2571,8 @@ cjc.mainProgram(args)
|
|
|
|
|
- Set portablerelease 1
|
|
|
|
|
- Set is_ga to 1
|
|
|
|
|
- Update sources to openjdk-17.0.12+7.tar.xz
|
|
|
|
|
- Resolves: RHEL-46641
|
|
|
|
|
- Resolves: RHEL-47019
|
|
|
|
|
- Resolves: RHEL-46635
|
|
|
|
|
- Resolves: RHEL-47021
|
|
|
|
|
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Tue Jul 9 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.6-0.1.ea
|
|
|
|
|
@ -2574,7 +2641,8 @@ cjc.mainProgram(args)
|
|
|
|
|
- Update tzdata BuildRequires comment to mention that 2024a is not yet in the buildroot
|
|
|
|
|
- Update tzdata BuildRequires from 2023c to 2023d
|
|
|
|
|
- Update sources from openjdk-17.0.11+7-ea.tar.xz to openjdk-17.0.11+9.tar.xz
|
|
|
|
|
- Resolves: RHEL-30939
|
|
|
|
|
- Resolves: RHEL-30941
|
|
|
|
|
- Resolves: RHEL-32421
|
|
|
|
|
- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Thu Mar 28 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.7-0.2.ea
|
|
|
|
|
@ -2587,7 +2655,7 @@ cjc.mainProgram(args)
|
|
|
|
|
- openjdk_news.sh: Use grep -E instead of egrep
|
|
|
|
|
- Remove RH1649512 patch for libjpeg-turbo FAR macro
|
|
|
|
|
- Move pcsc-lite-libs patch to in-need-of-upstreaming section
|
|
|
|
|
- Related: RHEL-30939
|
|
|
|
|
- Related: RHEL-30941
|
|
|
|
|
|
|
|
|
|
* Thu Jan 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.10.0.7-1
|
|
|
|
|
- Update to jdk-17.0.10+7 (GA)
|
|
|
|
|
@ -2597,7 +2665,7 @@ cjc.mainProgram(args)
|
|
|
|
|
- Re-enable DEFAULT_PROMOTED_VERSION_PRE check disabled for the July 2023 release
|
|
|
|
|
- generate_source_tarball.sh: Add --sort=name to tar invocation for reproducibility
|
|
|
|
|
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
|
|
|
|
- Resolves: RHEL-20995
|
|
|
|
|
- Resolves: RHEL-20997
|
|
|
|
|
|
|
|
|
|
* Thu Jan 11 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.10.0.7-1
|
|
|
|
|
- Update to jdk-17.0.10+6 (EA)
|
|
|
|
|
@ -2622,7 +2690,7 @@ cjc.mainProgram(args)
|
|
|
|
|
- generate_source_tarball.sh: shellcheck: Do not use $ in expression
|
|
|
|
|
- generate_source_tarball.sh: Remove temporary directory exit conditions
|
|
|
|
|
- generate_source_tarball.sh: Add note on network usage of OPENJDK_LATEST
|
|
|
|
|
- Related: RHEL-20995
|
|
|
|
|
- Related: RHEL-20997
|
|
|
|
|
|
|
|
|
|
* Thu Oct 12 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.9.0.9-1
|
|
|
|
|
- Update to jdk-17.0.9+9 (GA)
|
|
|
|
|
@ -2641,12 +2709,16 @@ cjc.mainProgram(args)
|
|
|
|
|
- Add missing JFR and jpackage alternative ghosts
|
|
|
|
|
- Move jcmd to the headless package
|
|
|
|
|
- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. **
|
|
|
|
|
- Resolves: RHEL-12226
|
|
|
|
|
- Resolves: RHEL-13662
|
|
|
|
|
- Resolves: RHEL-13673
|
|
|
|
|
- Resolves: RHEL-13683
|
|
|
|
|
- Resolves: RHEL-13648
|
|
|
|
|
- Resolves: RHEL-13651
|
|
|
|
|
- Resolves: RHEL-12228
|
|
|
|
|
- Resolves: RHEL-13660
|
|
|
|
|
- Resolves: RHEL-13665
|
|
|
|
|
- Resolves: RHEL-3494
|
|
|
|
|
- Resolves: RHEL-11317
|
|
|
|
|
- Resolves: RHEL-3461
|
|
|
|
|
|
|
|
|
|
* Mon Sep 04 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.1.1-2
|
|
|
|
|
- Set portablerelease and portablerhel to use the CentOS 9 build
|
|
|
|
|
- Resolves: RHEL-36137
|
|
|
|
|
|
|
|
|
|
* Mon Sep 04 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.1.1-2
|
|
|
|
|
- Bump release number so we are newer than 9.0
|
|
|
|
|
|
MSVSphere Packaging Team
4 months ago
