From f0b4e9ec98204f4fd5b99575d24a5078650ca46d Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 4 Aug 2020 19:38:17 -0400 Subject: [PATCH] Change cmake macros to fix FTBFS --- nextcloud-client.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/nextcloud-client.spec b/nextcloud-client.spec index f430d26..c6caa45 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -1,9 +1,9 @@ -%global __cmake_in_source_build 1 +%undefine __cmake_in_source_build %global _hardened_build 1 Name: nextcloud-client Version: 2.6.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Nextcloud Client # -libs are LGPLv2+, rest GPLv2 @@ -148,17 +148,12 @@ The nextcloud desktop client dolphin extension. %build -mkdir build -pushd build -%cmake_kf5 .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" -make %{?_smp_mflags} -popd - +%cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" +%cmake_build %install -pushd build -make install DESTDIR=%{buildroot} -popd +%cmake_install + %find_lang client --with-qt mkdir -p %{buildroot}%{_datadir}/appdata/ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml @@ -231,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud. %endif %changelog +* Tue Aug 04 2020 Mukundan Ragavan - 2.6.5-6 +- Change cmake macros to fix FTBFS + * Sat Aug 01 2020 Fedora Release Engineering - 2.6.5-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild