From b191639f1d4979ad9c53d4a082e6b1a840de48ae Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jan 11 2015 01:47:55 +0000 Subject: Explicitly define CMAKE_INSTALL_CMAKEDIR to work around FTBFS for now. Calamares uses plain GNUInstallDirs, but includes a submodule based on kde-partitionmanager which uses ECM (extra-cmake-modules). With extra-cmake-modules 1.6.0, there appears to be some bad interaction which leads to CMAKE_INSTALL_LIBDIR being empty on i686 at the line of CMakeLists.txt where CMAKE_INSTALL_CMAKEDIR is defined in terms of it. --- diff --git a/calamares.spec b/calamares.spec index abcc49a..c53e589 100644 --- a/calamares.spec +++ b/calamares.spec @@ -125,7 +125,7 @@ sed -i -e 's/^backend: dnf$/backend: yum/g' src/modules/packages/packages.conf %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} -DWITH_PARTITIONMANAGER:BOOL="ON" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" .. +%{cmake_kf5} -DWITH_PARTITIONMANAGER:BOOL="ON" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DCMAKE_INSTALL_CMAKEDIR:PATH=%{_lib}/cmake/Calamares .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -215,6 +215,7 @@ EOF - default-settings patch: Enable the packages module, make it remove calamares - desktop-file patch: Remove the NoDisplay=true line, unneeded with the above - Requires: dnf or yum depending on the Fedora version, for the packages module +- Explicitly define CMAKE_INSTALL_CMAKEDIR to work around FTBFS for now * Sun Dec 07 2014 Kevin Kofler - 0.17.0-5.20141206giteb748cca8ebfc - Bump Release to distinguish official F21 update from Copr build