From 33dc9783ad4df1d0e9926a60ff6820d7adbef86b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 5 Aug 2020 16:44:54 +0200 Subject: [PATCH] Use new cmake macros --- resolv_wrapper.spec | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/resolv_wrapper.spec b/resolv_wrapper.spec index fb0ad2b..34f4a27 100644 --- a/resolv_wrapper.spec +++ b/resolv_wrapper.spec @@ -1,6 +1,6 @@ Name: resolv_wrapper Version: 1.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A wrapper for dns name resolving or dns faking License: BSD @@ -39,30 +39,20 @@ 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} + -DUNIT_TESTING=ON -make %{?_smp_mflags} VERBOSE=1 -popd +%cmake_build %install -pushd obj -make DESTDIR=%{buildroot} install -popd +%cmake_install %ldconfig_scriptlets %check -pushd obj -ctest --output-on-failure +%ctest -LD_PRELOAD=src/libpam_wrapper.so bash -c '>/dev/null' -popd +LD_PRELOAD=%{__cmake_builddir}/src/libpam_wrapper.so bash -c '>/dev/null' %files %doc AUTHORS README.md CHANGELOG