From 45f411d6a1737d1fc5ca379b22b57362aedf7aaa Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jan 11 2015 02:34:04 +0000 Subject: Revert "Explicitly define CMAKE_INSTALL_LIBDIR to work around FTBFS for now." This reverts commit 4d86f96975d2e466f01712eef7725f62744868f7. --- diff --git a/calamares.spec b/calamares.spec index e953069..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" -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} .. +%{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,7 +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_LIBDIR to work around FTBFS for now +- 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