From 4543f37e04797890b7d7042e9385c97a97da78cf Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 8 Jul 2020 11:30:14 +0200 Subject: [PATCH] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- uchardet.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/uchardet.spec b/uchardet.spec index 0c028e3..6823bdd 100644 --- a/uchardet.spec +++ b/uchardet.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: uchardet Version: 0.0.6 Release: 10%{?dist} @@ -28,25 +30,20 @@ for developing tools for uchardet. %prep %autosetup -mkdir build %build -pushd build - %cmake .. \ - -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ - -DBUILD_STATIC=OFF - %make_build -popd +%cmake \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DBUILD_STATIC=OFF +%cmake_build %install -pushd build - %make_install -popd +%cmake_install %ldconfig_scriptlets %check -pushd build +pushd %{_vpath_builddir} ctest -VV \ %ifarch %{ix86} || :