From 6b0566e5ab907cc83cb38e795454c1ecf4222b82 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 2 Jun 2018 14:59:27 -0500 Subject: [PATCH] rpm-macros: do not define _qt5_archdatadir, _qt5_bindir in terms of _qt5_prefix anymore --- macros.qt5 | 4 ++-- qt5.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/macros.qt5 b/macros.qt5 index ebab2d7..c115037 100644 --- a/macros.qt5 +++ b/macros.qt5 @@ -1,6 +1,6 @@ %_qt5_prefix %{_libdir}/qt5 -%_qt5_archdatadir %{_qt5_prefix} -%_qt5_bindir %{_qt5_prefix}/bin +%_qt5_archdatadir %{_libdir}/qt5 +%_qt5_bindir %{_libdir}/qt5/bin %_qt5_datadir %{_datadir}/qt5 %_qt5_docdir %{_docdir}/qt5 %_qt5_examplesdir %{_qt5_prefix}/examples diff --git a/qt5.spec b/qt5.spec index e872c93..4dc8fab 100644 --- a/qt5.spec +++ b/qt5.spec @@ -1,7 +1,7 @@ Name: qt5 Version: 5.11.0 -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 +* Sat Jun 02 2018 Rex Dieter - 5.11.0-2 +- rpm-macros: do not define _qt5_archdatadir, _qt5_bindir in terms of _qt5_prefix anymore + * Sat May 26 2018 Rex Dieter - 5.11.0-1 - 5.11.0