From f10952772db5edf089071a9ad6193cdf73aeed3a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 May 2017 12:08:30 -0500 Subject: [PATCH] apply Qt5WebEngineCoreConfig.cmake hack only on < f27 --- qt5-qtwebengine.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index fbea8a1..8d47bad 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -41,7 +41,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.8.0 -Release: 12%{?dist} +Release: 13%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -463,9 +463,11 @@ popd mkdir -p %{buildroot}%{_qtwebengine_dictionaries_dir} -# adjust cmake dep(s) to allow for using the same Qt5 that was used to build it (even if older) +# adjust cmake dep(s) to allow for using the same Qt5 that was used to build it (if older) +%if 0%{?fedora} < 27 sed -i -e "s|%{version} \${_Qt5WebEngine|%{_qt5_version} \${_Qt5WebEngine|" \ %{buildroot}%{_qt5_libdir}/cmake/Qt5WebEngine*/Qt5WebEngine*Config.cmake +%endif %post -p /sbin/ldconfig @@ -569,6 +571,9 @@ done %changelog +* Thu May 11 2017 Rex Dieter - 5.8.0-13 +- apply Qt5WebEngineCoreConfig.cmake hack only on < f27 + * Wed May 10 2017 Rex Dieter - 5.8.0-12 - rebuild (Qt-5.9), disable docs for f27+