|
|
@ -184,6 +184,9 @@
|
|
|
|
%ifarch %{aarch64}
|
|
|
|
%ifarch %{aarch64}
|
|
|
|
%global archinstall aarch64
|
|
|
|
%global archinstall aarch64
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
%ifarch riscv64
|
|
|
|
|
|
|
|
%global archinstall riscv64
|
|
|
|
|
|
|
|
%endif
|
|
|
|
# 32 bit sparc, optimized for v9
|
|
|
|
# 32 bit sparc, optimized for v9
|
|
|
|
%ifarch sparcv9
|
|
|
|
%ifarch sparcv9
|
|
|
|
%global archinstall sparc
|
|
|
|
%global archinstall sparc
|
|
|
@ -206,7 +209,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
%global majorver 12
|
|
|
|
%global majorver 12
|
|
|
|
%global securityver 0
|
|
|
|
%global securityver 2
|
|
|
|
# buildjdkver is usually same as %%{majorver},
|
|
|
|
# buildjdkver is usually same as %%{majorver},
|
|
|
|
# but in time of bootstrap of next jdk, it is majorver-1,
|
|
|
|
# but in time of bootstrap of next jdk, it is majorver-1,
|
|
|
|
# and this it is better to change it here, on single place
|
|
|
|
# and this it is better to change it here, on single place
|
|
|
@ -224,7 +227,7 @@
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
%global minorver 0
|
|
|
|
%global minorver 0
|
|
|
|
%global buildver 33
|
|
|
|
%global buildver 9
|
|
|
|
# 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
|
|
|
|
%if %is_system_jdk
|
|
|
|
%if %is_system_jdk
|
|
|
|
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
|
|
|
|
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
|
|
|
@ -251,14 +254,16 @@
|
|
|
|
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
|
|
|
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
|
|
|
|
%if %is_system_jdk
|
|
|
|
|
|
|
|
%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*
|
|
|
|
%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*
|
|
|
|
|
|
|
|
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
|
|
|
|
|
|
|
|
%if %is_system_jdk
|
|
|
|
%global __provides_exclude ^(%{_privatelibs})$
|
|
|
|
%global __provides_exclude ^(%{_privatelibs})$
|
|
|
|
%global __requires_exclude ^(%{_privatelibs})$
|
|
|
|
%global __requires_exclude ^(%{_privatelibs})$
|
|
|
|
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
|
|
|
|
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
%global __provides_exclude lib.*[.]so.*
|
|
|
|
# Don't generate provides/requires for JDK provided shared libraries at all.
|
|
|
|
%global __requires_exclude lib.*[.]so.*
|
|
|
|
%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$
|
|
|
|
|
|
|
|
%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -948,7 +953,7 @@ Version: %{newjavaver}.%{buildver}
|
|
|
|
# This package needs `.rolling` as part of Release so as to not conflict on install with
|
|
|
|
# This package needs `.rolling` as part of Release so as to not conflict on install with
|
|
|
|
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
|
|
|
|
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
|
|
|
|
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
|
|
|
|
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
|
|
|
|
Release: 4.rolling%{?dist}
|
|
|
|
Release: 1.rolling.0.riscv64%{?dist}
|
|
|
|
# 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
|
|
|
@ -982,7 +987,7 @@ URL: http://openjdk.java.net/
|
|
|
|
|
|
|
|
|
|
|
|
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
|
|
|
|
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
|
|
|
|
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
|
|
|
|
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
|
|
|
|
Source0: jdk-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz
|
|
|
|
Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz
|
|
|
|
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
|
|
|
|
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
|
|
|
|
|
|
|
|
|
|
|
|
# Desktop files. Adapted from IcedTea
|
|
|
|
# Desktop files. Adapted from IcedTea
|
|
|
@ -1000,6 +1005,10 @@ Source13: TestCryptoLevel.java
|
|
|
|
# Ensure ECDSA is working
|
|
|
|
# Ensure ECDSA is working
|
|
|
|
Source14: TestECDSA.java
|
|
|
|
Source14: TestECDSA.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# New versions of config files with RISC-V (riscv64) support.
|
|
|
|
|
|
|
|
Source100: config.guess
|
|
|
|
|
|
|
|
Source101: config.sub
|
|
|
|
|
|
|
|
|
|
|
|
############################################
|
|
|
|
############################################
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# RPM/distribution specific patches
|
|
|
|
# RPM/distribution specific patches
|
|
|
@ -1022,6 +1031,9 @@ Patch5: pr1983-rh1565658-support_using_the_system_installation_of_nss_with_th
|
|
|
|
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
|
|
|
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
|
|
|
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
|
|
|
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# RISC-V (riscv64) support
|
|
|
|
|
|
|
|
Patch30: java-12-openjdk-riscv64.patch
|
|
|
|
|
|
|
|
|
|
|
|
BuildRequires: autoconf
|
|
|
|
BuildRequires: autoconf
|
|
|
|
BuildRequires: automake
|
|
|
|
BuildRequires: automake
|
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
@ -1259,6 +1271,12 @@ if [ $prioritylength -ne 8 ] ; then
|
|
|
|
exit 14
|
|
|
|
exit 14
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%ifarch riscv64
|
|
|
|
|
|
|
|
# Update config.{guess,sub} with RISC-V (riscv64) support
|
|
|
|
|
|
|
|
cp %{SOURCE100} openjdk/make/autoconf/build-aux/autoconf-config.guess
|
|
|
|
|
|
|
|
cp %{SOURCE101} openjdk/make/autoconf/build-aux/autoconf-config.sub
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
# OpenJDK patches
|
|
|
|
# OpenJDK patches
|
|
|
|
|
|
|
|
|
|
|
|
# Remove libraries that are linked
|
|
|
|
# Remove libraries that are linked
|
|
|
@ -1270,6 +1288,9 @@ pushd %{top_level_dir_name}
|
|
|
|
%patch4 -p1
|
|
|
|
%patch4 -p1
|
|
|
|
%patch5 -p1
|
|
|
|
%patch5 -p1
|
|
|
|
%patch6 -p1
|
|
|
|
%patch6 -p1
|
|
|
|
|
|
|
|
%ifarch riscv64
|
|
|
|
|
|
|
|
%patch30 -p2
|
|
|
|
|
|
|
|
%endif
|
|
|
|
popd # openjdk
|
|
|
|
popd # openjdk
|
|
|
|
|
|
|
|
|
|
|
|
%patch1000
|
|
|
|
%patch1000
|
|
|
@ -1328,7 +1349,7 @@ export NUM_PROC=${NUM_PROC:-1}
|
|
|
|
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
|
|
|
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
|
|
|
%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
|
|
|
|
export ARCH_DATA_MODEL=64
|
|
|
|
export ARCH_DATA_MODEL=64
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
%ifarch alpha
|
|
|
|
%ifarch alpha
|
|
|
@ -1510,7 +1531,10 @@ quit
|
|
|
|
end
|
|
|
|
end
|
|
|
|
run -version
|
|
|
|
run -version
|
|
|
|
EOF
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%ifnarch riscv64
|
|
|
|
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
|
|
|
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
# Check src.zip has all sources. See RHBZ#1130490
|
|
|
|
# Check src.zip has all sources. See RHBZ#1130490
|
|
|
|
jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
|
|
|
jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
|
|
@ -1592,7 +1616,7 @@ popd
|
|
|
|
# Install Javadoc documentation
|
|
|
|
# Install Javadoc documentation
|
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
|
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
|
|
|
|
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
|
|
|
|
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
|
|
|
|
cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
|
|
|
|
cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
|
|
|
|
|
|
|
|
|
|
|
|
# Install icons and menu entries
|
|
|
|
# Install icons and menu entries
|
|
|
|
for s in 16 24 32 48 ; do
|
|
|
|
for s in 16 24 32 48 ; do
|
|
|
@ -1822,10 +1846,22 @@ require "copy_jdk_configs.lua"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Thu Apr 04 2019 Petra Mikova <pmikova@redhat.com - 1:12.0.0.33-4.rolling
|
|
|
|
* Mon May 24 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:12.0.2.9-1.rolling.0.riscv64
|
|
|
|
|
|
|
|
- Add support for riscv64
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Jul 18 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:12.0.2.9-1.rolling
|
|
|
|
|
|
|
|
- Update to July 2019 CPU update (tag jdk-12.0.2+9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue May 21 2019 Petra Alice Mikova <pmikova@redhat.com> - 1:12.0.1.12-2.rolling
|
|
|
|
|
|
|
|
- fixed requires/provides for the non-system JDK case (backport of RHBZ#1702324)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Apr 18 2019 Petra Mikova <pmikova@redhat.com> - 1:12.0.1.12-1.rolling
|
|
|
|
|
|
|
|
- updated sources to current CPU release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Apr 04 2019 Petra Mikova <pmikova@redhat.com> - 1:12.0.0.33-4.rolling
|
|
|
|
- added slave for jfr binary in devel package
|
|
|
|
- added slave for jfr binary in devel package
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Mar 21 2019 Petra Mikova <pmikova@redhat.com - 1:12.0.0.33-3.rolling
|
|
|
|
* Thu Mar 21 2019 Petra Mikova <pmikova@redhat.com> - 1:12.0.0.33-3.rolling
|
|
|
|
- Replaced pcsc-lite-devel (which is in optional channel) with pcsc-lite-libs.
|
|
|
|
- Replaced pcsc-lite-devel (which is in optional channel) with pcsc-lite-libs.
|
|
|
|
- added rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch to make jdk work with pcsc
|
|
|
|
- added rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch to make jdk work with pcsc
|
|
|
|
- removed LTS string from LTS designator, because epel builds get identified as rhel and JDK 12 is not LTS
|
|
|
|
- removed LTS string from LTS designator, because epel builds get identified as rhel and JDK 12 is not LTS
|
|
|
|