From 6d1d21050efc12ef67c300c43bb285375c2ecdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Matos?= Date: Mon, 27 Jul 2020 19:41:48 +0100 Subject: [PATCH] Adapt cmake to work with out of tree builds (and other minor cleanups) --- armadillo.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/armadillo.spec b/armadillo.spec index 07d5e18..de82f68 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -78,12 +78,14 @@ done %else %{cmake} %endif -%{__make} VERBOSE=1 %{?_smp_mflags} +%cmake_build %install +%if %{old_epel} == 1 rm -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT +%endif +%cmake_build rm -f examples/Makefile.cmake rm -f examples/example1_win64.sln rm -f examples/example1_win64.vcxproj @@ -91,7 +93,7 @@ rm -f examples/example1_win64.README.txt rm -rf examples/lib_win64 -%if ((0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} < 28)) +%if ((0%{?rhel} && 0%{?rhel} <= 7) %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -118,6 +120,7 @@ rm -rf examples/lib_win64 %changelog * Mon Jul 27 2020 Fedora Release Engineering - 9.900.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Adapt cmake to work with out of tree builds (and other minor cleanups) * Fri Jul 17 2020 José Matos - 9.900.2-1 - update to 9.900.2