From 50be7cfe08e99e2d0010da36370aa5e5f712e66d Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 19 Nov 2024 13:37:47 +0800 Subject: [PATCH] adopt to new cmake macro --- octomap.spec | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/octomap.spec b/octomap.spec index 97f813e..00a6960 100644 --- a/octomap.spec +++ b/octomap.spec @@ -2,7 +2,7 @@ Name: octomap Version: 1.9.8 -Release: 2 +Release: 3 Summary: Efficient Probabilistic 3D Mapping Framework Based on Octrees # octovis is GPLv2, octomap and dynamic-edt-3d are BSD @@ -82,34 +82,25 @@ This package contains doxygen-generated API documentation for %{name} %prep %setup -q -%patch0 -p0 -b .libdir -%patch1 -p1 -b .qglviewer +%patch -P0 -p0 -b .libdir +%patch -P1 -p1 -b .qglviewer %build -mkdir build && cd build - %cmake \ -DCMAKE_BUILD_TYPE=None \ -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF \ -DBUILD_OCTOVIS_SUBPROJECT=OFF \ - .. -%make_build -%make_build docs +%cmake_build +%cmake_build --target docs %install -%make_install -C build +%cmake_install %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} # Color octree comes out to be wrong size on ix86; ignore for now -make test || exit 0 - -%ldconfig_scriptlets - -#%ldconfig_scriptlets -n %{name}-octovis - -#%ldconfig_scriptlets -n dynamic-edt-3d +%ctest --output-on-failure || exit 0 %files %license octomap/LICENSE.txt @@ -163,6 +154,9 @@ make test || exit 0 #%{_libdir}/dynamicEDT3D %changelog +* Tue Nov 19 2024 Funda Wang - 1.9.8-3 +- adopt to new cmake macro + * Mon Jun 26 2023 will_niutao - 1.9.8-2 - delete octovis and dynamicedt3d package -- Gitee