Fix flatpak builds
...after <6eee73b250
> "Update to jdk-11.0.16.1+1" added the TestTranslations.java "test to ensure timezones can be translated": Similar to the previous <1ac4052b44
> "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.
This commit is contained in:
parent
f94304807a
commit
899fd56af2
@ -2425,10 +2425,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)
|
||||
@ -2697,6 +2701,9 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Dec 07 2022 Stephan Bergmann <sbergman@redhat.com> - 1:19.0.1.0.10-3.rolling
|
||||
- Fix flatpak builds by disabling TestTranslations test due to missing tzdb.dat
|
||||
|
||||
* Wed Oct 26 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.1.0.10-2.rolling
|
||||
- Update in-tree tzdata to 2022e with JDK-8294357 & JDK-8295173
|
||||
- Update CLDR data with Europe/Kyiv (JDK-8293834)
|
||||
|
Loading…
Reference in New Issue
Block a user