From ab41a2e52cb2a13e6d5e676ec97675c6f90c0247 Mon Sep 17 00:00:00 2001 From: Petra Mikova Date: Mon, 30 Jan 2023 14:05:41 +0100 Subject: [PATCH] Fix flatpak builds --- java-latest-openjdk-portable.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index b07dc97..30c3f86 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -1502,10 +1502,14 @@ if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; els $JAVA_HOME/bin/javac -d . %{SOURCE16} $JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}" -# Check translations are available for new timezones +%if ! 0%{?flatpak} +# Check translations are available for new timezones (during flatpak builds, the +# tzdb.dat used by this test is not where the test expects it, so this is +# disabled for flatpak builds) $JAVA_HOME/bin/javac -d . %{SOURCE18} $JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR +%endif %if %{include_staticlibs} # Check debug symbols in static libraries (smoke test) @@ -1594,6 +1598,9 @@ done %endif %changelog +* Thu Jan 19 2023 Stephan Bergmann - 1:19.0.1.0.10-3.rolling + - Fix flatpak builds by disabling TestTranslations test due to missing tzdb.dat + * Thu Jan 19 2023 Fedora Release Engineering - 1:19.0.1.0.10-3.rolling.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild