From c45ae1042c95ff5d5825b46073821c30d683d6fe Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 7 Apr 2021 09:15:47 +0200 Subject: [PATCH] Disable copy-jdk-configs for Flatpak builds There does not appear to be any value in having copy-jdk-config in Flatpak builds (where a given Flatpak bundles one specific JDK, so no need for a "Utility script to transfer JDKs configuration files between updates or for archiving.") And at least when trying to do a LibreOffice Flatpak build from Fedora 34 RPM specs (which includes java-11-openjdk among its components), the #!/usr/bin/lua shebang in copy_jdk_configs.lua would have caused a requirement on /usr/bin/lua, but which a lua RPM bundled in the Flatpak would not provide (as it would provide /app/bin/lua instead). And the easiest way to work around that issue is to just disable the unnecessary copy-jdk-configs. --- java-11-openjdk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 37da581..2075e1f 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -345,7 +345,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 7 -%global rpmrelease 0 +%global rpmrelease 1 #%%global tagsuffix "" # 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 @@ -1011,11 +1011,13 @@ Requires: tzdata-java >= 2020f # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} +%if ! 0%{?flatpak} # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be # considered as regression Requires: copy-jdk-configs >= 3.3 OrderWithRequires: copy-jdk-configs +%endif # for printing support Requires: cups-libs # Post requires alternatives to install tool alternatives @@ -2284,6 +2286,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Tue Apr 20 2021 Stephan Bergmann - 1:11.0.11.0.7-1.0.ea +- Disable copy-jdk-configs for Flatpak builds + * Sun Apr 11 2021 Andrew Hughes - 1:11.0.11.0.7-0.0.ea - Update to jdk-11.0.11.0+7 - Update release notes to 11.0.11.0+7