From f5c569a098849563dd6130bff1b3639c1a1c3a9f Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 8 Jul 2020 16:44:28 +0200 Subject: [PATCH] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- uid_wrapper.spec | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/uid_wrapper.spec b/uid_wrapper.spec index b658ec4..dca6d0b 100644 --- a/uid_wrapper.spec +++ b/uid_wrapper.spec @@ -40,28 +40,17 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup -p1 %build -if test ! -e "obj"; then - mkdir obj -fi -pushd obj %cmake \ - -DUNIT_TESTING=ON \ - %{_builddir}/%{name}-%{version} - -make %{?_smp_mflags} VERBOSE=1 -popd + -DUNIT_TESTING=ON +%cmake_build %install -pushd obj -make DESTDIR=%{buildroot} install -popd +%cmake_install %ldconfig_scriptlets %check -pushd obj -make test || cat $(find Testing -name "*.log") -popd +%ctest %files %doc AUTHORS README.md ChangeLog