From 64e4924e6b5a51152c9f4ec1005d700a015162d5 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Tue, 11 Aug 2020 10:29:21 +0200 Subject: [PATCH] Use %cmake_ macros to fix out-of-source builds The out-of-source builds are now enabled by default, see: https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds Use %cmake_build and %cmake_install macros and also remove redundant statements for winpr tools to fix the broken build. Resolves: rhbz#1863586 --- freerdp.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/freerdp.spec b/freerdp.spec index 56e21d5..91b0471 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -22,7 +22,7 @@ Name: freerdp Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 Summary: Free implementation of the Remote Desktop Protocol (RDP) License: ASL 2.0 @@ -214,15 +214,10 @@ find . -name "*.c" -exec chmod 664 {} \; %endif . -%make_build - -pushd winpr/tools/makecert-cli -%make_build -popd +%cmake_build %install -%make_install -%make_install COMPONENT=tools +%cmake_install find %{buildroot} -name "*.a" -delete @@ -300,6 +295,9 @@ find %{buildroot} -name "*.a" -delete %{_libdir}/pkgconfig/winpr-tools2.pc %changelog +* Tue Aug 11 2020 Ondrej Holy - 2:2.2.0-4 +- Use %%cmake_ macros to fix out-of-source builds (#1863586) + * Sat Aug 01 2020 Fedora Release Engineering - 2:2.2.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild