From 45b9234adc338f8ea64459edd1ca1e1f5e6bf9a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 29 Jun 2018 13:36:27 -0500 Subject: [PATCH] %_qt5_prefix=%_prefix (was %_libdir/qt5} At least a few code bases (*cough* kf5 *cough*) make an educated guess about system Qt if prefix=/usr, so let's ablige them. --- macros.qt5 | 4 ++-- qt5.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/macros.qt5 b/macros.qt5 index c115037..cf64309 100644 --- a/macros.qt5 +++ b/macros.qt5 @@ -1,9 +1,9 @@ -%_qt5_prefix %{_libdir}/qt5 +%_qt5_prefix %{_prefix} %_qt5_archdatadir %{_libdir}/qt5 %_qt5_bindir %{_libdir}/qt5/bin %_qt5_datadir %{_datadir}/qt5 %_qt5_docdir %{_docdir}/qt5 -%_qt5_examplesdir %{_qt5_prefix}/examples +%_qt5_examplesdir %{_qt5_archdatadir}/examples %_qt5_headerdir %{_includedir}/qt5 %_qt5_includedir %{_includedir}/qt5 %_qt5_importdir %{_qt5_archdatadir}/imports diff --git a/qt5.spec b/qt5.spec index ac06918..342016e 100644 --- a/qt5.spec +++ b/qt5.spec @@ -1,7 +1,7 @@ Name: qt5 Version: 5.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt5 meta package License: GPLv3 URL: https://getfedora.org/ @@ -132,6 +132,9 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README %changelog +* Fri Jun 29 2018 Rex Dieter - 5.11.1-2 +- %%_qt5_prefix=%%_prefix (was %%_libdir/qt5} + * Tue Jun 19 2018 Rex Dieter - 5.11.1-1 - 5.11.1