|
|
|
|
@ -102,8 +102,7 @@
|
|
|
|
|
# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip}
|
|
|
|
|
%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
|
|
|
|
|
|
|
|
|
|
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
|
|
|
|
|
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
|
|
|
|
|
# Indicates whether this is the default JDK on this version of RHEL
|
|
|
|
|
%global is_system_jdk 0
|
|
|
|
|
|
|
|
|
|
%global aarch64 aarch64 arm64 armv8
|
|
|
|
|
@ -303,8 +302,12 @@
|
|
|
|
|
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
|
%global majorver 8
|
|
|
|
|
|
|
|
|
|
# Define IcedTea version used for SystemTap tapsets and desktop file
|
|
|
|
|
# Define version of OpenJDK 8 used
|
|
|
|
|
%global project openjdk
|
|
|
|
|
%global repo shenandoah-jdk8u
|
|
|
|
|
%global openjdk_revision jdk8u392-b08
|
|
|
|
|
%global shenandoah_revision shenandoah-%{openjdk_revision}
|
|
|
|
|
# Define IcedTea version used for SystemTap tapsets and desktop files
|
|
|
|
|
%global icedteaver 3.15.0
|
|
|
|
|
# Define current Git revision for the FIPS support patches
|
|
|
|
|
%global fipsver 6d1aade0648
|
|
|
|
|
@ -314,7 +317,7 @@
|
|
|
|
|
# Standard JPackage naming and versioning defines
|
|
|
|
|
%global origin openjdk
|
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
|
%global top_level_dir_name %{shenandoah_revision}
|
|
|
|
|
|
|
|
|
|
# Settings for local security configuration
|
|
|
|
|
%global security_file %{top_level_dir_name}/jdk/src/share/lib/security/java.security-%{_target_os}
|
|
|
|
|
@ -333,35 +336,24 @@
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora}
|
|
|
|
|
%else
|
|
|
|
|
%if 0%{?rhel}
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{name}
|
|
|
|
|
%global oj_vendor_bug_url https://access.redhat.com/support/cases/
|
|
|
|
|
%else
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
|
|
|
|
%global shenandoah_project openjdk
|
|
|
|
|
%global shenandoah_repo shenandoah-jdk8u
|
|
|
|
|
%global openjdk_revision jdk8u382-b05
|
|
|
|
|
%global shenandoah_revision shenandoah-%{openjdk_revision}
|
|
|
|
|
# Define old aarch64/jdk8u tree variables for compatibility
|
|
|
|
|
%global project %{shenandoah_project}
|
|
|
|
|
%global repo %{shenandoah_repo}
|
|
|
|
|
%global revision %{shenandoah_revision}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
|
|
|
|
|
%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*})
|
|
|
|
|
%global version_tag %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
|
|
|
|
|
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
|
|
|
|
|
%global whole_update %(VERSION=%{version_tag}; echo ${VERSION%%-*})
|
|
|
|
|
# eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
|
|
|
|
|
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
|
|
|
|
# eg jdk8u60-b27 -> b27
|
|
|
|
|
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
|
|
|
|
%global rpmrelease 2
|
|
|
|
|
%global rpmrelease 3
|
|
|
|
|
# Settings used by the portable build
|
|
|
|
|
%global portablerelease 2
|
|
|
|
|
%global portablerelease 1
|
|
|
|
|
%global portablesuffix el8
|
|
|
|
|
%global portablebuilddir /builddir/build/BUILD
|
|
|
|
|
|
|
|
|
|
@ -1009,11 +1001,12 @@ exit 0
|
|
|
|
|
%ifarch %{jfr_arches}
|
|
|
|
|
%dir %{_jvmdir}/%{jredir -- %{?1}}/lib/jfr
|
|
|
|
|
%endif
|
|
|
|
|
# RHEL-11313; alternatives not owned by packages
|
|
|
|
|
%if %is_system_jdk
|
|
|
|
|
%if %{is_release_build -- %{?1}}
|
|
|
|
|
%ghost %{_bindir}/java
|
|
|
|
|
%ghost %{_jvmdir}/jre
|
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1312019
|
|
|
|
|
%ghost %{_bindir}/%{alt_java_name}
|
|
|
|
|
%ghost %{_bindir}/jjs
|
|
|
|
|
%ghost %{_bindir}/keytool
|
|
|
|
|
%ghost %{_bindir}/orbd
|
|
|
|
|
@ -1023,6 +1016,9 @@ exit 0
|
|
|
|
|
%ghost %{_bindir}/servertool
|
|
|
|
|
%ghost %{_bindir}/tnameserv
|
|
|
|
|
%ghost %{_bindir}/unpack200
|
|
|
|
|
%ghost %{_jvmdir}/jre-%{origin}
|
|
|
|
|
%ghost %{_jvmdir}/jre-%{javaver}
|
|
|
|
|
%ghost %{_jvmdir}/jre-%{javaver}-%{origin}
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
}
|
|
|
|
|
@ -1109,8 +1105,8 @@ exit 0
|
|
|
|
|
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/javah-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jdb-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jdeps-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jhat-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
@ -1135,8 +1131,10 @@ exit 0
|
|
|
|
|
%dir %{tapsetdir}
|
|
|
|
|
%{tapsetdir}/*%{_arch}%{?1}.stp
|
|
|
|
|
%endif
|
|
|
|
|
# RHEL-11313; alternatives not owned by packages
|
|
|
|
|
%if %is_system_jdk
|
|
|
|
|
%if %{is_release_build -- %{?1}}
|
|
|
|
|
%ghost %{_bindir}/javac
|
|
|
|
|
%ghost %{_jvmdir}/java
|
|
|
|
|
%ghost %{_bindir}/appletviewer
|
|
|
|
|
%ghost %{_bindir}/clhsdb
|
|
|
|
|
@ -1145,9 +1143,6 @@ exit 0
|
|
|
|
|
%ghost %{_bindir}/idlj
|
|
|
|
|
%ghost %{_bindir}/jar
|
|
|
|
|
%ghost %{_bindir}/jarsigner
|
|
|
|
|
%ghost %{_bindir}/java
|
|
|
|
|
%ghost %{_bindir}/java-rmi.cgi
|
|
|
|
|
%ghost %{_bindir}/javac
|
|
|
|
|
%ghost %{_bindir}/javadoc
|
|
|
|
|
%ghost %{_bindir}/javah
|
|
|
|
|
%ghost %{_bindir}/javap
|
|
|
|
|
@ -1155,6 +1150,7 @@ exit 0
|
|
|
|
|
%ghost %{_bindir}/jconsole
|
|
|
|
|
%ghost %{_bindir}/jdb
|
|
|
|
|
%ghost %{_bindir}/jdeps
|
|
|
|
|
%ghost %{_bindir}/jfr
|
|
|
|
|
%ghost %{_bindir}/jhat
|
|
|
|
|
%ghost %{_bindir}/jinfo
|
|
|
|
|
%ghost %{_bindir}/jjs
|
|
|
|
|
@ -1165,22 +1161,16 @@ exit 0
|
|
|
|
|
%ghost %{_bindir}/jstack
|
|
|
|
|
%ghost %{_bindir}/jstat
|
|
|
|
|
%ghost %{_bindir}/jstatd
|
|
|
|
|
%ghost %{_bindir}/keytool
|
|
|
|
|
%ghost %{_bindir}/native2ascii
|
|
|
|
|
%ghost %{_bindir}/orbd
|
|
|
|
|
%ghost %{_bindir}/pack200
|
|
|
|
|
%ghost %{_bindir}/policytool
|
|
|
|
|
%ghost %{_bindir}/rmic
|
|
|
|
|
%ghost %{_bindir}/rmid
|
|
|
|
|
%ghost %{_bindir}/rmiregistry
|
|
|
|
|
%ghost %{_bindir}/schemagen
|
|
|
|
|
%ghost %{_bindir}/serialver
|
|
|
|
|
%ghost %{_bindir}/servertool
|
|
|
|
|
%ghost %{_bindir}/tnameserv
|
|
|
|
|
%ghost %{_bindir}/unpack200
|
|
|
|
|
%ghost %{_bindir}/wsgen
|
|
|
|
|
%ghost %{_bindir}/wsimport
|
|
|
|
|
%ghost %{_bindir}/xjc
|
|
|
|
|
%ghost %{_jvmdir}/java-%{origin}
|
|
|
|
|
%ghost %{_jvmdir}/java-%{javaver}
|
|
|
|
|
%ghost %{_jvmdir}/java-%{javaver}-%{origin}
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
}
|
|
|
|
|
@ -1403,10 +1393,10 @@ URL: http://openjdk.java.net/
|
|
|
|
|
# OpenJDK 8u, the aarch64 port and Shenandoah
|
|
|
|
|
# To regenerate, use:
|
|
|
|
|
# VERSION=%%{shenandoah_revision}
|
|
|
|
|
# FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
|
|
|
|
|
# FILE_NAME_ROOT=%%{project}-%%{repo}-${VERSION}
|
|
|
|
|
# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
|
|
|
|
|
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
|
|
|
|
|
Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve.tar.xz
|
|
|
|
|
# where the source is obtained from http://github.com/%%{project}/%%{repo}
|
|
|
|
|
Source0: %{project}-%{repo}-%{shenandoah_revision}.tar.xz
|
|
|
|
|
|
|
|
|
|
# Release notes
|
|
|
|
|
Source7: NEWS
|
|
|
|
|
@ -1572,6 +1562,8 @@ Patch203: jdk8042159-allow_using_system_installed_lcms2-root.patch
|
|
|
|
|
Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
|
|
|
|
|
# JDK-8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
|
|
|
|
|
Patch581: jdk8257794-remove_broken_assert.patch
|
|
|
|
|
# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
|
|
|
|
|
Patch2000: jdk8312489-max_sig_default_increase.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
@ -1693,7 +1685,7 @@ Provides: bundled(lcms2) = 2.10.0
|
|
|
|
|
# Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
|
|
|
|
Provides: bundled(libjpeg) = 6b
|
|
|
|
|
# Version in jdk/src/share/native/sun/awt/libpng/png.h
|
|
|
|
|
Provides: bundled(libpng) = 1.6.37
|
|
|
|
|
Provides: bundled(libpng) = 1.6.39
|
|
|
|
|
%ifnarch %{portable_build_arches}
|
|
|
|
|
# We link statically against libstdc++ to increase portability
|
|
|
|
|
BuildRequires: libstdc++-static
|
|
|
|
|
@ -1940,6 +1932,7 @@ if [ $prioritylength -ne 7 ] ; then
|
|
|
|
|
fi
|
|
|
|
|
# For old patches
|
|
|
|
|
ln -s %{top_level_dir_name} jdk8
|
|
|
|
|
ln -s %{top_level_dir_name} openjdk
|
|
|
|
|
|
|
|
|
|
# replace outdated configure guess script
|
|
|
|
|
#
|
|
|
|
|
@ -1993,6 +1986,8 @@ pushd %{top_level_dir_name}
|
|
|
|
|
%patch1000 -p1
|
|
|
|
|
# cacerts patch; must follow FIPS patch as it also alters java.security
|
|
|
|
|
%patch539 -p1
|
|
|
|
|
# JDK-8312489 backport, proposed for 8u402: https://github.com/openjdk/jdk8u-dev/pull/381
|
|
|
|
|
%patch2000 -p1
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
|
|
# RPM-only fixes
|
|
|
|
|
@ -2882,23 +2877,50 @@ cjc.mainProgram(args)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Jul 19 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-2
|
|
|
|
|
- Bump release number so we are newer than 9.0
|
|
|
|
|
- Related: rhbz#2221106
|
|
|
|
|
* Mon Oct 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-3
|
|
|
|
|
- Revert jcmd move as jcmd will not operate without tools.jar
|
|
|
|
|
- Related: RHEL-13605
|
|
|
|
|
|
|
|
|
|
* Sat Jul 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-1
|
|
|
|
|
- The 'prelease' variable should refer to 'portablerelease', not 'rpmrelease'
|
|
|
|
|
- Move file installation back within the pushd to jdk_image
|
|
|
|
|
- Related: rhbz#2221106
|
|
|
|
|
* Tue Oct 10 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-2
|
|
|
|
|
- Update to shenandoah-jdk8u392-b08 (GA)
|
|
|
|
|
- Update release notes for shenandoah-8u392-b08.
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
- Update generate_tarball.sh to be closer to upstream vanilla script inc. no more ECC removal
|
|
|
|
|
- Update bug URL for RHEL to point to the Red Hat customer portal
|
|
|
|
|
- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
|
|
|
|
|
- Regenerate PR2462 patch following JDK-8315135
|
|
|
|
|
- Bump version of bundled libpng to 1.6.39
|
|
|
|
|
- Add backport of JDK-8312489 heading upstream for 8u402 (see OPENJDK-2095)
|
|
|
|
|
- Add missing JFR, alt-java, jre-* and java-* alternative ghosts
|
|
|
|
|
- Move jcmd to the headless package
|
|
|
|
|
- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. **
|
|
|
|
|
- Resolves: RHEL-12208
|
|
|
|
|
- Resolves: RHEL-13587
|
|
|
|
|
- Resolves: RHEL-13590
|
|
|
|
|
- Resolves: RHEL-13593
|
|
|
|
|
- Resolves: RHEL-13583
|
|
|
|
|
- Resolves: RHEL-13605
|
|
|
|
|
- Resolves: RHEL-13615
|
|
|
|
|
|
|
|
|
|
* Fri Sep 29 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b01-1
|
|
|
|
|
- Update to shenandoah-jdk8u392-b01 (GA)
|
|
|
|
|
- Update release notes for shenandoah-8u392-b01.
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
- Update generate_tarball.sh to be closer to upstream vanilla script inc. no more ECC removal
|
|
|
|
|
- Update bug URL for RHEL to point to the Red Hat customer portal
|
|
|
|
|
- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
|
|
|
|
|
- Related: RHEL-12209
|
|
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-1
|
|
|
|
|
- Update to shenandoah-jdk8u372-b05 (GA)
|
|
|
|
|
- Update release notes for shenandoah-8u372-b05.
|
|
|
|
|
* Wed Jul 19 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-2
|
|
|
|
|
- Update to shenandoah-jdk8u382-b05 (GA)
|
|
|
|
|
- Update release notes for shenandoah-8u382-b05.
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
- Add note at top of spec file about rebuilding
|
|
|
|
|
- Use tapsets from the misc tarball on portable builds
|
|
|
|
|
- Make sure root installation directory is created first
|
|
|
|
|
- Use in-place substitution for all but the first of the tapset changes
|
|
|
|
|
- The 'prelease' variable should refer to 'portablerelease', not 'rpmrelease'
|
|
|
|
|
- Bump release number so we are newer than 9.0
|
|
|
|
|
- ** This tarball is embargoed until 2023-07-18 @ 1pm PT. **
|
|
|
|
|
- Resolves: rhbz#2221106
|
|
|
|
|
|
|
|
|
|
|
MSVSphere Packaging Team
1 year ago