From 9d5487a6bfde8900e8e23233acb355b0c0e32a96 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:48:56 +0100 Subject: [PATCH] update to 8u222b10_3.13.0 provide sun-java and sun-java-runtime to fix multiple requiring packages from old java builds [release 8u222b10_3.13.0-1mamba;Sat Oct 26 2019] --- icedtea.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/icedtea.spec b/icedtea.spec index 165611e..677c068 100644 --- a/icedtea.spec +++ b/icedtea.spec @@ -70,7 +70,7 @@ #%endif Name: icedtea -Version: 8u212b04_3.12.0 +Version: 8u222b10_3.13.0 Release: 1mamba Summary: The IcedTea project provides a harness to build the openjdk Group: System/Libraries/Java @@ -228,6 +228,7 @@ Provides: %{_bindir}/xjc Provides: java-openjdk = %{javaver} Provides: java-openjdk Obsoletes: java-openjdk +Provides: sun-java %description -n java-openjdk%{javaver} The OpenJDK Development Environment. @@ -260,6 +261,7 @@ Provides: %{_bindir}/unpack200 Provides: java-openjdk-runtime = %{javaver} Provides: java-openjdk-runtime Obsoletes: java-openjdk-runtime +Provides: sun-java-runtime %description -n java-openjdk%{javaver}-runtime The OpenJDK runtime environment. @@ -299,8 +301,9 @@ Obsoletes: java-openjdk-javadoc The OpenJDK API documentation. %prep -%setup -q -n icedtea-%{icedtea_version} -D -T -:<< _EOF +%setup -q -n icedtea-%{icedtea_version} +#-D -T +#:<< _EOF # Build workaround %ifnarch x86_64 sed "s|-Xshare:dump|-Xshare:dump -Xmx512m|" Makefile.in @@ -372,7 +375,16 @@ make MEMORY_LIMIT=-J-Xmx512m patch %ifarch arm LD_PRELOAD=%{_libdir}/libatomic.so make MEMORY_LIMIT=-J-Xmx512m DISABLE_HOTSPOT_OS_VERSION_CHECK=ok %else +count=0 +set +e +while [[ count -lt 50 ]]; do +# Workaround for java random crashes on build servers +count=$((count+1)) make MEMORY_LIMIT=-J-Xmx512m DISABLE_HOTSPOT_OS_VERSION_CHECK=ok +[ $? -eq 0 ] && break +done +[ $? -ne 0 ] && exit 1 +set -e %endif :<< ___EOF @@ -1009,10 +1021,15 @@ exit 0 %endif %ifarch arm %doc %{_datadir}/javadoc/java-8-openjdk-arm +%endif #%doc ChangeLog NEWS #%doc README* %changelog +* Sat Oct 26 2019 Silvan Calarco 8u222b10_3.13.0-1mamba +- update to 8u222b10_3.13.0 +- provide sun-java and sun-java-runtime to fix multiple requiring packages from old java builds + * Tue Jun 11 2019 Silvan Calarco 8u212b04_3.12.0-1mamba - update to 8u212b04_3.12.0