From 3db71523241420862921d7ff452513180d575b58 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 6 Dec 2022 13:19:17 +0100 Subject: [PATCH] Fix flatpak builds ...after "Update to jdk-11.0.16.1+1" added the TestTranslations.java "test to ensure timezones can be translated": Similar to the previous "Fix flatpak builds", during a flatpak build of java-11-openjdk its .../images/jdk/lib/tzdb.dat is a dangling symlink to /app/share/javazi-1.8/tzdb.dat (but which will be a working symlink in at least the assembled LibreOffice flatpak). That causes execution of TestTranslations.java during the build to fail due to a java.io.FileNotFoundException when trying to access that tzdb.dat. The easiest fix appears to be to just not run that specific test for a flatpak build. --- java-17-openjdk.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 2c305ec..1d0e225 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -2400,10 +2400,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) @@ -2672,6 +2676,9 @@ cjc.mainProgram(args) %endif %changelog +* Tue Dec 07 2022 Stephan Bergmann - 1:17.0.6.0.1-0.3.ea +- Fix flatpak builds + * Wed Nov 23 2022 Andrew Hughes - 1:17.0.6.0.1-0.2.ea - Update FIPS support to bring in latest changes - * Add nss.fips.cfg support to OpenJDK tree