diff --git a/rapidjson.spec b/rapidjson.spec index adf7dc63be0fa4fbb84bc951a221a4f8f1dda49b..a82ff89b5a47c7bb52b5c2ca86555eaff62a97d4 100644 --- a/rapidjson.spec +++ b/rapidjson.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: rapidjson Version: 1.1.0 -Release: 14 +Release: 15 Summary: small & selft-contained fast JSON parser and generator for C++ License: MIT URL: http://miloyip.github.io/rapidjson @@ -58,15 +58,11 @@ done %{_bindir}/xargs -0 %{__sed} -i -e's![ \t]*-march=native!!g' -e's![ \t]*-Werror!!g' %build -cd build -%cmake -DDOC_INSTALL_DIR=%{_pkgdocdir} -DRAPIDJSON_BUILD_CXX11:BOOL=OFF -DGTESTSRC_FOUND=TRUE -DGTEST_SOURCE_DIR=. .. -%make_build -cd - +%cmake -DDOC_INSTALL_DIR=%{_pkgdocdir} -DRAPIDJSON_BUILD_CXX11:BOOL=OFF -DGTESTSRC_FOUND=TRUE +%cmake_build %install -cd build -%make_install -cd - +%cmake_install %{__mv} -f %{buildroot}%{_libdir}/* %{buildroot}%{_datadir} %{__cp} -a CHANGELOG.md readme*.md examples %{buildroot}%{_pkgdocdir} %{_bindir}/find %{buildroot} -type f -name 'CMake*.txt' -print0 | \ @@ -76,9 +72,7 @@ hardlink -v %{buildroot}%{_pkgdocdir} %check CTEST_EXCLUDE=".*valgrind.*" -cd build -%{_bindir}/ctest -E "${CTEST_EXCLUDE}" -V . -cd - +%ctest -E "${CTEST_EXCLUDE}" %files devel %license license.txt @@ -93,6 +87,9 @@ cd - %doc %{_pkgdocdir} %changelog +* Thu Nov 07 2024 Funda Wang - 1.1.0-15 +- adopt to new cmake macro + * Sat Sep 28 2024 laokz - 1.1.0-14 - let buildrequire:valgrind depend on system macro