|
|
|
|
@ -1,3 +1,8 @@
|
|
|
|
|
# To rebuild this RPM, you must first rebuild the portable
|
|
|
|
|
# RPM using the java-17-openjdk-portable.specfile, install
|
|
|
|
|
# it and then adjust portablerelease and portablesuffix
|
|
|
|
|
# to match the new portable.
|
|
|
|
|
|
|
|
|
|
# RPM conditionals so as to be able to dynamically produce
|
|
|
|
|
# slowdebug/release builds. See:
|
|
|
|
|
# http://rpm.org/user_doc/conditional_builds.html
|
|
|
|
|
@ -133,9 +138,9 @@
|
|
|
|
|
# Set of architectures which support the serviceability agent
|
|
|
|
|
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
|
|
|
|
|
# Set of architectures which support class data sharing
|
|
|
|
|
# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
|
|
|
|
|
# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
|
|
|
|
|
%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x
|
|
|
|
|
# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
|
|
|
|
|
# However, it does segfault on the Zero assembler port, so currently JIT only
|
|
|
|
|
%global share_arches %{jit_arches}
|
|
|
|
|
# Set of architectures for which we build the Shenandoah garbage collector
|
|
|
|
|
%global shenandoah_arches x86_64 %{aarch64}
|
|
|
|
|
# Set of architectures for which we build the Z garbage collector
|
|
|
|
|
@ -226,6 +231,10 @@
|
|
|
|
|
# JDK to use for bootstrapping
|
|
|
|
|
%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
|
|
|
|
|
|
|
|
|
|
# VM variant being built
|
|
|
|
|
# This is always 'server' on 17u which doesn't have JDK-8273494
|
|
|
|
|
%global vm_variant server
|
|
|
|
|
|
|
|
|
|
# debugedit tool for rewriting ELF file paths
|
|
|
|
|
%global debugedit %{_rpmconfigdir}/debugedit
|
|
|
|
|
|
|
|
|
|
@ -313,7 +322,7 @@
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
|
%global featurever 17
|
|
|
|
|
%global interimver 0
|
|
|
|
|
%global updatever 7
|
|
|
|
|
%global updatever 8
|
|
|
|
|
%global patchver 0
|
|
|
|
|
# buildjdkver is usually same as %%{featurever},
|
|
|
|
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
|
|
|
|
@ -361,9 +370,9 @@
|
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
|
|
|
|
%global buildver 7
|
|
|
|
|
%global rpmrelease 3
|
|
|
|
|
%global rpmrelease 2
|
|
|
|
|
# Settings used by the portable build
|
|
|
|
|
%global portablerelease 2
|
|
|
|
|
%global portablerelease 1
|
|
|
|
|
%global portablesuffix el8
|
|
|
|
|
%global portablebuilddir /builddir/build/BUILD
|
|
|
|
|
|
|
|
|
|
@ -573,10 +582,6 @@ alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} $key %{_jvmdir}/%{jre
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
%define post_headless() %{expand:
|
|
|
|
|
%ifarch %{share_arches}
|
|
|
|
|
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|
|
|
|
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
|
|
|
|
|
|
|
@ -873,9 +878,12 @@ exit 0
|
|
|
|
|
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
|
|
|
|
|
%ifarch %{share_arches}
|
|
|
|
|
%attr(444, root, root) %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/classes.jsa
|
|
|
|
|
%attr(444, root, root) %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/classes.jsa
|
|
|
|
|
%ifnarch %{ix86} %{arm32}
|
|
|
|
|
%attr(444, root, root) %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/classes_nocoops.jsa
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%dir %{etcjavasubdir}
|
|
|
|
|
%dir %{etcjavadir -- %{?1}}
|
|
|
|
|
@ -1243,6 +1251,8 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
|
|
|
|
Name: java-%{javaver}-%{origin}
|
|
|
|
|
Version: %{newjavaver}.%{buildver}
|
|
|
|
|
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
|
|
|
|
|
# Equivalent for the portable build
|
|
|
|
|
%global prelease %{?eaprefix}%{portablerelease}%{?extraver}
|
|
|
|
|
# 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
|
|
|
|
|
# also included the epoch in their virtual provides. This created a
|
|
|
|
|
@ -1315,14 +1325,14 @@ Source19: README.md
|
|
|
|
|
Source20: java-%{featurever}-openjdk-portable.specfile
|
|
|
|
|
|
|
|
|
|
# Setup variables to reference correct sources
|
|
|
|
|
%global releasezip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.unstripped.jdk.%{_arch}.tar.xz
|
|
|
|
|
%global staticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.static-libs.%{_arch}.tar.xz
|
|
|
|
|
%global docszip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.docs.%{_arch}.tar.xz
|
|
|
|
|
%global misczip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.misc.%{_arch}.tar.xz
|
|
|
|
|
%global slowdebugzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.slowdebug.jdk.%{_arch}.tar.xz
|
|
|
|
|
%global slowdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.slowdebug.static-libs.%{_arch}.tar.xz
|
|
|
|
|
%global fastdebugzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.fastdebug.jdk.%{_arch}.tar.xz
|
|
|
|
|
%global fastdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.fastdebug.static-libs.%{_arch}.tar.xz
|
|
|
|
|
%global releasezip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.unstripped.jdk.%{_arch}.tar.xz
|
|
|
|
|
%global staticlibzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.static-libs.%{_arch}.tar.xz
|
|
|
|
|
%global docszip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.docs.%{_arch}.tar.xz
|
|
|
|
|
%global misczip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.misc.%{_arch}.tar.xz
|
|
|
|
|
%global slowdebugzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.slowdebug.jdk.%{_arch}.tar.xz
|
|
|
|
|
%global slowdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.slowdebug.static-libs.%{_arch}.tar.xz
|
|
|
|
|
%global fastdebugzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.fastdebug.jdk.%{_arch}.tar.xz
|
|
|
|
|
%global fastdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.fastdebug.static-libs.%{_arch}.tar.xz
|
|
|
|
|
|
|
|
|
|
############################################
|
|
|
|
|
#
|
|
|
|
|
@ -1393,10 +1403,6 @@ Patch1001: fips-17u-%{fipsver}.patch
|
|
|
|
|
# OpenJDK patches appearing in 17.0.8
|
|
|
|
|
#
|
|
|
|
|
#############################################
|
|
|
|
|
# JDK-8274864: Remove Amman/Cairo hacks in ZoneInfoFile
|
|
|
|
|
Patch2001: jdk8274864-remove_amman_cairo_hacks.patch
|
|
|
|
|
# JDK-8305113: (tz) Update Timezone Data to 2023c
|
|
|
|
|
Patch2002: jdk8305113-tzdata2023c.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
@ -1438,19 +1444,19 @@ BuildRequires: xorg-x11-proto-devel
|
|
|
|
|
BuildRequires: zip
|
|
|
|
|
BuildRequires: javapackages-filesystem
|
|
|
|
|
%if %{include_normal_build}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-unstripped = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-static-libs = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-unstripped = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-static-libs = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
%endif
|
|
|
|
|
%if %{include_fastdebug_build}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-devel-fastdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-static-libs-fastdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-devel-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-static-libs-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
%endif
|
|
|
|
|
%if %{include_debug_build}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-devel-slowdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-static-libs-slowdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-devel-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-static-libs-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-docs = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-docs = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{prelease}.%{portablesuffix}
|
|
|
|
|
# Zero-assembler build requirement
|
|
|
|
|
%ifarch %{zero_arches}
|
|
|
|
|
BuildRequires: libffi-devel
|
|
|
|
|
@ -1478,9 +1484,9 @@ Provides: bundled(freetype) = 2.12.1
|
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
|
|
|
|
Provides: bundled(giflib) = 5.2.1
|
|
|
|
|
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
|
|
|
|
Provides: bundled(harfbuzz) = 4.4.1
|
|
|
|
|
Provides: bundled(harfbuzz) = 7.0.1
|
|
|
|
|
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
|
|
|
|
Provides: bundled(lcms2) = 2.12.0
|
|
|
|
|
Provides: bundled(lcms2) = 2.15.0
|
|
|
|
|
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
|
|
|
|
Provides: bundled(libjpeg) = 6b
|
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
|
|
|
|
@ -1852,9 +1858,6 @@ pushd %{top_level_dir_name}
|
|
|
|
|
%patch1001 -p1
|
|
|
|
|
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
|
|
|
|
%patch1000 -p1
|
|
|
|
|
# tzdata update
|
|
|
|
|
%patch2001 -p1
|
|
|
|
|
%patch2002 -p1
|
|
|
|
|
popd # openjdk
|
|
|
|
|
|
|
|
|
|
%patch600
|
|
|
|
|
@ -1876,38 +1879,11 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
|
|
|
|
|
echo "WARNING: Designator mismatch";
|
|
|
|
|
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
|
|
|
|
|
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
|
|
|
|
|
exit 17
|
|
|
|
|
# Temporarily commented out as local copy of jdk-17.0.8+7 has the wrong setting
|
|
|
|
|
# This is fixed in the final upstream version
|
|
|
|
|
# exit 17
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Extract systemtap tapsets
|
|
|
|
|
%if %{with_systemtap}
|
|
|
|
|
tar --strip-components=1 -x -I xz -f %{SOURCE8}
|
|
|
|
|
%if %{include_debug_build}
|
|
|
|
|
cp -r tapset tapset%{debug_suffix}
|
|
|
|
|
%endif
|
|
|
|
|
%if %{include_fastdebug_build}
|
|
|
|
|
cp -r tapset tapset%{fastdebug_suffix}
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
for suffix in %{build_loop} ; do
|
|
|
|
|
for file in "tapset"$suffix/*.in; do
|
|
|
|
|
OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
|
|
|
|
|
sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
|
|
|
|
|
sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
|
|
|
|
|
# TODO find out which architectures other than i686 have a client vm
|
|
|
|
|
%ifarch %{ix86}
|
|
|
|
|
sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
|
|
|
|
|
%else
|
|
|
|
|
sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
|
|
|
|
|
%endif
|
|
|
|
|
sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
|
|
|
|
|
sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
|
|
|
|
|
sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
|
|
|
|
|
done
|
|
|
|
|
done
|
|
|
|
|
# systemtap tapsets ends
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Prepare desktop files
|
|
|
|
|
# The _X_ syntax indicates variables that are replaced by make upstream
|
|
|
|
|
# The @X@ syntax indicates variables that are replaced by configure upstream
|
|
|
|
|
@ -1944,6 +1920,16 @@ function customisejdk() {
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mkdir -p $(dirname %{installoutputdir})
|
|
|
|
|
|
|
|
|
|
docdir=%{installoutputdir -- "-docs"}
|
|
|
|
|
tar -xJf %{docszip}
|
|
|
|
|
mv java-%{featurever}-openjdk*.docs.* ${docdir}
|
|
|
|
|
|
|
|
|
|
miscdir=%{installoutputdir -- "-misc"}
|
|
|
|
|
tar -xJf %{misczip}
|
|
|
|
|
mv java-%{featurever}-openjdk*.misc.* ${miscdir}
|
|
|
|
|
|
|
|
|
|
for suffix in %{build_loop} ; do
|
|
|
|
|
|
|
|
|
|
if [ "x$suffix" = "x" ] ; then
|
|
|
|
|
@ -1962,17 +1948,32 @@ for suffix in %{build_loop} ; do
|
|
|
|
|
# TODO: should verify checksums when using packages from buildroot
|
|
|
|
|
tar -xJf ${jdkzip}
|
|
|
|
|
tar -xJf ${staticlibzip}
|
|
|
|
|
mkdir -p $(dirname ${installdir})
|
|
|
|
|
mv java-%{featurever}-openjdk* ${installdir}
|
|
|
|
|
|
|
|
|
|
# Fix build paths in ELF files so it looks like we built them
|
|
|
|
|
portablenvr="%{name}-%{VERSION}-%{portablerelease}.%{portablesuffix}.%{_arch}"
|
|
|
|
|
portablenvr="%{name}-%{VERSION}-%{prelease}.%{portablesuffix}.%{_arch}"
|
|
|
|
|
for file in $(find ${installdir} -type f) ; do
|
|
|
|
|
if file ${file} | grep -q 'ELF'; then
|
|
|
|
|
%{debugedit} -b %{portablebuilddir}/${portablenvr} -d $(pwd) -n ${file}
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Set tapset variables to match this build
|
|
|
|
|
%if %{with_systemtap}
|
|
|
|
|
for file in ${miscdir}/tapset${suffix}/*.in; do
|
|
|
|
|
OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
|
|
|
|
|
sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > ${OUTPUT_FILE}
|
|
|
|
|
# TODO find out which architectures other than i686 have a client vm
|
|
|
|
|
%ifarch %{ix86}
|
|
|
|
|
sed -i -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" ${OUTPUT_FILE}
|
|
|
|
|
%else
|
|
|
|
|
sed -i -e "/@ABS_CLIENT_LIBJVM_SO@/d" ${OUTPUT_FILE}
|
|
|
|
|
%endif
|
|
|
|
|
sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
|
|
|
|
|
sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
|
|
|
|
|
done
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Final setup on the main image
|
|
|
|
|
customisejdk ${installdir}
|
|
|
|
|
|
|
|
|
|
@ -1982,14 +1983,6 @@ for suffix in %{build_loop} ; do
|
|
|
|
|
# build cycles
|
|
|
|
|
done # end of release / debug cycle loop
|
|
|
|
|
|
|
|
|
|
docdir=%{installoutputdir -- "-docs"}
|
|
|
|
|
tar -xJf %{docszip}
|
|
|
|
|
mv java-%{featurever}-openjdk*.docs.* ${docdir}
|
|
|
|
|
|
|
|
|
|
miscdir=%{installoutputdir -- "-misc"}
|
|
|
|
|
tar -xJf %{misczip}
|
|
|
|
|
mv java-%{featurever}-openjdk*.misc.* ${miscdir}
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
|
|
|
|
|
# We test debug first as it will give better diagnostics on a crash
|
|
|
|
|
@ -2138,7 +2131,7 @@ for suffix in %{build_loop} ; do
|
|
|
|
|
jdk_image=$(pwd)/%{installoutputdir -- ${suffix}}
|
|
|
|
|
# Should match same definitions in build section
|
|
|
|
|
docdir=$(pwd)/%{installoutputdir -- "-docs"}
|
|
|
|
|
miscdir=%{installoutputdir -- "-misc"}
|
|
|
|
|
miscdir=$(pwd)/%{installoutputdir -- "-misc"}
|
|
|
|
|
|
|
|
|
|
# Install release notes and rebuild instructions
|
|
|
|
|
commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix}
|
|
|
|
|
@ -2150,13 +2143,10 @@ cp -a %{SOURCE19} %{SOURCE20} ${commondocdir}
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
|
|
|
|
|
cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
|
|
|
|
|
|
|
|
|
|
pushd ${jdk_image}
|
|
|
|
|
|
|
|
|
|
%if %{with_systemtap}
|
|
|
|
|
# Install systemtap support files
|
|
|
|
|
install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset
|
|
|
|
|
# note, that uniquesuffix is in BUILD dir in this case
|
|
|
|
|
cp -a $RPM_BUILD_DIR/%{uniquesuffix ""}/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/
|
|
|
|
|
cp -a ${miscdir}/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/
|
|
|
|
|
pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/
|
|
|
|
|
tapsetFiles=`ls *.stp`
|
|
|
|
|
popd
|
|
|
|
|
@ -2181,6 +2171,7 @@ pushd ${jdk_image}
|
|
|
|
|
|
|
|
|
|
# Install man pages
|
|
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
|
|
|
|
|
pushd ${jdk_image}
|
|
|
|
|
for manpage in man/man1/*
|
|
|
|
|
do
|
|
|
|
|
# Convert man pages to UTF8 encoding
|
|
|
|
|
@ -2191,8 +2182,7 @@ pushd ${jdk_image}
|
|
|
|
|
done
|
|
|
|
|
# Remove man pages from jdk image
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/man
|
|
|
|
|
|
|
|
|
|
popd
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
|
|
if ! echo $suffix | grep -q "debug" ; then
|
|
|
|
|
# Install Javadoc documentation
|
|
|
|
|
@ -2490,6 +2480,53 @@ require "copy_jdk_configs.lua"
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Jul 19 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.0.7-2
|
|
|
|
|
- Bump release number so we are newer than 8.6
|
|
|
|
|
- Related: rhbz#2221106
|
|
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.0.7-1
|
|
|
|
|
- Update to jdk-17.0.8+7 (GA)
|
|
|
|
|
- Update release notes to 17.0.8+7
|
|
|
|
|
- Switch to GA mode for final release.
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
- Add note at top of spec file about rebuilding
|
|
|
|
|
- * This tarball is embargoed until 2023-07-18 @ 1pm PT. *
|
|
|
|
|
- Resolves: rhbz#2221106
|
|
|
|
|
|
|
|
|
|
* Thu Jul 13 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.0.6-0.1.ea
|
|
|
|
|
- Update to jdk-17.0.8+6 (EA)
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
- Resolves: rhbz#2217714
|
|
|
|
|
|
|
|
|
|
* Wed Jul 12 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.0.1-0.1.ea
|
|
|
|
|
- Update to jdk-17.0.8+1 (EA)
|
|
|
|
|
- Update release notes to 17.0.8+1
|
|
|
|
|
- Switch to EA mode
|
|
|
|
|
- Drop local inclusion of JDK-8274864 & JDK-8305113 as they are included in 17.0.8+1
|
|
|
|
|
- Bump bundled LCMS version to 2.15 as in jdk-17.0.8+1.
|
|
|
|
|
- Bump bundled HarfBuzz version to 7.0.1 as in jdk-17.0.8+1
|
|
|
|
|
- Use tapsets from the misc tarball
|
|
|
|
|
- Introduce 'prelease' for the portable release versioning, to handle EA builds
|
|
|
|
|
- Make sure root installation directory is created first
|
|
|
|
|
- Use in-place substitution for all but the first of the tapset changes
|
|
|
|
|
- Related: rhbz#2217714
|
|
|
|
|
|
|
|
|
|
* Tue Jul 11 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-4
|
|
|
|
|
- Introduce vm_variant global for consistency with future JDK builds
|
|
|
|
|
- Related: rhbz#2196908
|
|
|
|
|
|
|
|
|
|
* Mon May 15 2023 Jiri Vanek <jvanek@redhat.com> - 1:17.0.7.0.7-4
|
|
|
|
|
- Exclude classes_nocoops.jsa on i686 and arm32
|
|
|
|
|
- Related: rhbz#2196908
|
|
|
|
|
|
|
|
|
|
* Mon May 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-4
|
|
|
|
|
- Following JDK-8005165, class data sharing can be enabled on all JIT architectures
|
|
|
|
|
- Related: rhbz#2196908
|
|
|
|
|
|
|
|
|
|
* Wed May 10 2023 Severin Gehwolf <sgehwolf@redhat.com> - 1:17.0.7.0.7-4
|
|
|
|
|
- Fix packaging of CDS archives
|
|
|
|
|
- Resolves: rhbz#2196908
|
|
|
|
|
|
|
|
|
|
* Wed Apr 26 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-3
|
|
|
|
|
- Sync portable spec file with current version
|
|
|
|
|
- Related: rhbz#2189330
|
|
|
|
|
|
Andrew Lukoshko
2 years ago