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.
This commit is contained in:
parent
393926b8c7
commit
8a2ee29496
10
qt.spec
10
qt.spec
|
@ -27,8 +27,11 @@
|
||||||
# trim changelog included in binary rpms
|
# trim changelog included in binary rpms
|
||||||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
%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
|
%define qtchooser 1
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?qtchooser}
|
%if 0%{?qtchooser}
|
||||||
%define priority 20
|
%define priority 20
|
||||||
%ifarch %{multilib_basearchs}
|
%ifarch %{multilib_basearchs}
|
||||||
|
@ -40,7 +43,7 @@ Summary: Qt toolkit
|
||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.7
|
Version: 4.8.7
|
||||||
Release: 41%{?dist}
|
Release: 43%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# 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
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
|
@ -1403,6 +1406,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 21 2018 Owen Taylor <otaylor@redhat.com> - 1:4.8.7-43
|
||||||
|
- Disable qtchooser for Flatpak builds
|
||||||
|
|
||||||
* Sat Jul 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-42
|
* Sat Jul 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.8.7-42
|
||||||
- drop BR: pkgconfig(NetworkManager) (#1606047)
|
- drop BR: pkgconfig(NetworkManager) (#1606047)
|
||||||
- use %%make_build %%ldconfig
|
- use %%make_build %%ldconfig
|
||||||
|
|
Loading…
Reference in New Issue