From 51bd7e14daf340745688a262abe640cdff94a5ea Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 30 Apr 2021 08:22:12 +0200 Subject: [PATCH] Disable copy-jdk-configs for Flatpak builds --- java-latest-openjdk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index c7f48c6..4f60d1d 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -967,11 +967,13 @@ Requires: tzdata-java >= 2015d # 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.9 OrderWithRequires: copy-jdk-configs +%endif # for printing support Requires: cups-libs # Post requires alternatives to install tool alternatives @@ -2230,6 +2232,7 @@ cjc.mainProgram(arg) %changelog * Fri Apr 29 2021 Jiri Vanek - 1:16.0.1.0.9-2.rolling - adapted to newst cjc to fix issue with rpm 4.17 +- Disable copy-jdk-configs for Flatpak builds * Sun Apr 25 2021 Petra Alice Mikova - 1:16.0.1.0.9-1.rolling - update to 16.0.1+9 april cpu tag