From 910153cefc0f8147dab34eaa93d0a1c8ed02a13e Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jul 29 2020 09:57:48 +0000 Subject: Use new cmake macros --- diff --git a/jsoncpp.spec b/jsoncpp.spec index 0b50d52..cc0ee17 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -11,7 +11,7 @@ Name: jsoncpp Version: 1.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JSON library implemented in C++ License: Public Domain or MIT @@ -72,21 +72,19 @@ mkdir -p %{_vpath_builddir} -DJSONCPP_WITH_STRICT_ISO:BOOL=ON \ -DJSONCPP_WITH_TESTS:BOOL=ON \ -DJSONCPP_WITH_WARNING_AS_ERROR:BOOL=OFF \ - -DPYTHON_EXECUTABLE:STRING="%{__python3}" \ - -B $PWD/%{_vpath_builddir} \ - -S $PWD -%make_build -C %{_vpath_builddir} + -DPYTHON_EXECUTABLE:STRING="%{__python3}" +%cmake_build %if %{with jsoncpp_enables_doc} # Build the doc -cp -p %{_vpath_builddir}/version . +cp -p %{__cmake_builddir}/version . %{__python3} doxybuild.py --with-dot --doxygen %{_bindir}/doxygen rm -f version %endif %install -%make_install -C %{_vpath_builddir} +%cmake_install mkdir -p %{buildroot}%{_docdir}/%{name} install -pm 0644 README.md %{buildroot}%{_docdir}/%{name} @@ -99,7 +97,7 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %check -%make_build -C %{_vpath_builddir} jsoncpp_check +%ctest %ldconfig_scriptlets @@ -131,6 +129,9 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %changelog +* Wed Jul 29 2020 Björn Esser - 1.9.3-3 +- Use new cmake macros + * Tue Jul 28 2020 Fedora Release Engineering - 1.9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild