From 5e06aeea02f849612e9c747967746ea9fbf63326 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sep 07 2020 17:21:45 +0000 Subject: use cmake macro --- diff --git a/grantlee-qt5.spec b/grantlee-qt5.spec index f5ac3f0..49eda07 100644 --- a/grantlee-qt5.spec +++ b/grantlee-qt5.spec @@ -1,12 +1,10 @@ %define apidocs 1 -%global __cmake_in_source_build 1 - Name: grantlee-qt5 Summary: Qt5 string template engine based on the Django template system Version: 5.2.0 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ URL: https://github.com/steveire/grantlee @@ -77,25 +75,22 @@ format for easy browsing. %autosetup -n grantlee-%{version} -p1 %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake} .. \ +%cmake \ -DCMAKE_BUILD_TYPE=release -popd -%make_build -C %{_target_platform} +%cmake_build %if 0%{?apidocs} -make docs -C %{_target_platform} +make docs -C %{__cmake_builddir} %endif %install -make install/fast -C %{_target_platform} DESTDIR=%{buildroot} +%cmake_install %if 0%{?apidocs} mkdir -p %{buildroot}%{_docdir}/HTML/en/Grantlee5/ -cp -prf %{_target_platform}/apidox/* %{buildroot}%{_docdir}/HTML/en/Grantlee5/ +cp -prf %{__cmake_builddir}/apidox/* %{buildroot}%{_docdir}/HTML/en/Grantlee5/ %endif # rpm macros @@ -113,7 +108,7 @@ sed -i \ %check export CTEST_OUTPUT_ON_FAILURE=1 -xvfb-run -a make test -C %{_target_platform} ||: +xvfb-run -a make test -C %{__cmake_builddir} ||: %ldconfig_scriptlets @@ -142,6 +137,9 @@ xvfb-run -a make test -C %{_target_platform} ||: %changelog +* Mon Sep 07 2020 Than Ngo - 5.2.0-9 +- use cmake macro + * Tue Aug 11 2020 Rex Dieter - 5.2.0-8 - FTBFS, define %__cmake_in_source_build until we have time to port to new cmake macros