From 47db35d6bd471f6743fa6213dc2f21d277d32863 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 5 Aug 2020 18:13:24 +0200 Subject: [PATCH] Build using new cmake macros --- pam_wrapper.spec | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pam_wrapper.spec b/pam_wrapper.spec index 427063f..4601a19 100644 --- a/pam_wrapper.spec +++ b/pam_wrapper.spec @@ -1,6 +1,6 @@ Name: pam_wrapper Version: 1.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool to test PAM applications and PAM modules License: GPLv3+ @@ -84,25 +84,16 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %build -if test ! -e "obj"; then - mkdir obj -fi -pushd obj %cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DUNIT_TESTING=ON \ - %{_builddir}/%{name}-%{version} + -DUNIT_TESTING=ON -make %{?_smp_mflags} VERBOSE=1 -make doc VERBOSE=1 -popd +%cmake_build +%__cmake --build %{__cmake_builddir} --target docs %install -pushd obj -make DESTDIR=%{buildroot} install -popd - +%cmake_install %ldconfig_scriptlets @@ -110,9 +101,7 @@ popd %check -pushd obj -ctest --output-on-failure -popd +%ctest %files %{_libdir}/libpam_wrapper.so* @@ -149,6 +138,9 @@ popd %{python3_sitearch}/pypamtest.so %changelog +* Wed Aug 05 2020 Andreas Schneider - 1.1.3-5 +- Build using new cmake macros + * Sat Aug 01 2020 Fedora Release Engineering - 1.1.3-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild