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
This commit is contained in:
Ondrej Holy 2020-08-11 10:29:21 +02:00
parent 06ed1d897c
commit 64e4924e6b

View File

@ -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 <oholy@redhat.com> - 2:2.2.0-4
- Use %%cmake_ macros to fix out-of-source builds (#1863586)
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.2.0-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild