From 5b6d4b12f405c8a3dee198c1d9a84527a2635d2f Mon Sep 17 00:00:00 2001 From: Owen W. Taylor Date: Sep 24 2018 17:30:09 +0000 Subject: Pass Qt paths we'll use in the file list to CMake --- diff --git a/phonon.spec b/phonon.spec index 86df542..296ea8d 100644 --- a/phonon.spec +++ b/phonon.spec @@ -121,7 +121,9 @@ pushd %{_target_platform} %{!?zeitgeist:-DCMAKE_DISABLE_FIND_PACKAGE_QZeitgeist:BOOL=ON} \ -DPHONON_BUILD_DECLARATIVE_PLUGIN:BOOL=%{?declarative:ON}%{!?declarative:OFF} \ -DPHONON_INSTALL_QT_COMPAT_HEADERS:BOOL=ON \ - -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON + -DPHONON_QT_IMPORTS_INSTALL_DIR=%{_qt4_importdir} \ + -DPHONON_QT_MKSPECS_INSTALL_DIR=%{_qt4_datadir}/mkspecs/modules \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=%{_qt4_plugindir}/designer popd %make_build -C %{_target_platform} @@ -132,7 +134,9 @@ pushd %{_target_platform}-Qt5 -DCMAKE_BUILD_TYPE:STRING="Release" \ -DPHONON_BUILD_DECLARATIVE_PLUGIN:BOOL=%{?declarative:ON}%{!?declarative:OFF} \ -DPHONON_BUILD_PHONON4QT5:BOOL=ON \ - -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON + -DPHONON_QT_IMPORTS_INSTALL_DIR=%{_qt5_importdir} \ + -DPHONON_QT_MKSPECS_INSTALL_DIR=%{_qt5_archdatadir}/mkspecs/modules \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=%{_qt5_plugindir}/designer popd %make_build -C %{_target_platform}-Qt5 @@ -210,7 +214,8 @@ end %changelog -* Fri Sep 21 2018 Owen Taylor - 4.10.1-3 +* Mon Sep 24 2018 Owen Taylor - 4.10.1-3 +- Pass Qt paths we'll use in the file list to CMake - In %%check, augment PKG_CONFIG_PATH, not replace it * Fri Jul 13 2018 Fedora Release Engineering - 4.10.1-2