From 8a2ee294967c4508ccbfce1333a2d9054147a6a9 Mon Sep 17 00:00:00 2001 From: Owen W. Taylor Date: Sep 28 2018 18:30:05 +0000 Subject: Disable qtchooser for Flatpak builds When building for inclusion in an application Flatpak, the qtchooser functionality doesn't make sense. Disable it to avoid problems with update-alternatives. --- diff --git a/qt.spec b/qt.spec index 3990b7a..0552799 100644 --- a/qt.spec +++ b/qt.spec @@ -27,8 +27,11 @@ # trim changelog included in binary rpms %global _changelog_trimtime %(date +%s -d "1 year ago") -# support qtchooser +# support qtchooser, except when building for inclusion in a flatpak +%if !0%{?flatpak} %define qtchooser 1 +%endif + %if 0%{?qtchooser} %define priority 20 %ifarch %{multilib_basearchs} @@ -40,7 +43,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.7 -Release: 41%{?dist} +Release: 43%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -1403,6 +1406,9 @@ fi %changelog +* Fri Sep 21 2018 Owen Taylor - 1:4.8.7-43 +- Disable qtchooser for Flatpak builds + * Sat Jul 21 2018 Rex Dieter - 1:4.8.7-42 - drop BR: pkgconfig(NetworkManager) (#1606047) - use %%make_build %%ldconfig