%_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.
This commit is contained in:
Rex Dieter 2018-06-29 13:36:27 -05:00
parent 32afac2472
commit 45b9234adc
2 changed files with 6 additions and 3 deletions

View File

@ -1,9 +1,9 @@
%_qt5_prefix %{_libdir}/qt5 %_qt5_prefix %{_prefix}
%_qt5_archdatadir %{_libdir}/qt5 %_qt5_archdatadir %{_libdir}/qt5
%_qt5_bindir %{_libdir}/qt5/bin %_qt5_bindir %{_libdir}/qt5/bin
%_qt5_datadir %{_datadir}/qt5 %_qt5_datadir %{_datadir}/qt5
%_qt5_docdir %{_docdir}/qt5 %_qt5_docdir %{_docdir}/qt5
%_qt5_examplesdir %{_qt5_prefix}/examples %_qt5_examplesdir %{_qt5_archdatadir}/examples
%_qt5_headerdir %{_includedir}/qt5 %_qt5_headerdir %{_includedir}/qt5
%_qt5_includedir %{_includedir}/qt5 %_qt5_includedir %{_includedir}/qt5
%_qt5_importdir %{_qt5_archdatadir}/imports %_qt5_importdir %{_qt5_archdatadir}/imports

View File

@ -1,7 +1,7 @@
Name: qt5 Name: qt5
Version: 5.11.1 Version: 5.11.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Qt5 meta package Summary: Qt5 meta package
License: GPLv3 License: GPLv3
URL: https://getfedora.org/ URL: https://getfedora.org/
@ -132,6 +132,9 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
%changelog %changelog
* Fri Jun 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-2
- %%_qt5_prefix=%%_prefix (was %%_libdir/qt5}
* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1 * Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
- 5.11.1 - 5.11.1