diff options
| -rw-r--r-- | easynav-regulated-pp-controller.spec | 15 | ||||
| -rw-r--r-- | sources | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/easynav-regulated-pp-controller.spec b/easynav-regulated-pp-controller.spec index 87d870f..0d6c80b 100644 --- a/easynav-regulated-pp-controller.spec +++ b/easynav-regulated-pp-controller.spec @@ -10,7 +10,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy Navigation: port of the Nav2 Regulated Pure Pursuit Controller. License: Apache-2.0 URL: https://github.com/EasyNavigation/easynav_plugins @@ -20,8 +20,8 @@ URL: https://github.com/EasyNavigation/easynav_plugins # commit 为 ros_fetch checkout 后实测的 HEAD（git rev-parse），非占位值。 # 归档解压根目录：经本地 tar tzf 实测 build/SOURCES/<commit>.tar.gz，解压根目录为 # 纯完整 commit SHA（703b73ae...），与 spec-rules-ros.md §2 实踩纪律一致。 -# 注：同仓兄弟 spec（easynav-mpc/mppi）误用 -n easynav_plugins-%{commit}，但 SRPM -# 阶段不跑 %prep 故未暴露；本包据实测纠正为 -n %{commit}。 +# 注：同仓兄弟 spec（easynav-mpc/mppi）误用 -n easynav_plugins-%%{commit}，但 SRPM +# 阶段不跑 %%prep 故未暴露；本包据实测纠正为 -n %%{commit}。 %global commit 703b73ae55bf6a419bf309b26084ca523b063ddf Source0: https://github.com/EasyNavigation/easynav_plugins/archive/%{commit}.tar.gz @@ -103,7 +103,7 @@ export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packa export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} # 多包仓库：仅构建目标包子目录 controllers/easynav_regulated_pp_controller -# ament_cmake 形态显式 out-of-source（spec-rules §5），避免 openEuler %cmake 宏位置参数坑 +# ament_cmake 形态显式 out-of-source（spec-rules §5），避免 openEuler %%cmake 宏位置参数坑 cd controllers/easynav_regulated_pp_controller mkdir -p .obj cd .obj @@ -121,10 +121,15 @@ cd controllers/easynav_regulated_pp_controller/.obj make install DESTDIR=%{buildroot} %files -# %files 整树拥有（spec-rules §7）：对「装了没打包」类错误免疫 +# %%files 整树拥有（spec-rules §7）：对「装了没打包」类错误免疫 /opt/ros/%{ros_distro} %changelog +* Tue Oct 20 2026 AI Importer <ai-importer@opencode> - 0.5.0-2 +- Fix build failure: escape %%cmake / %%prep / %%files / %%{commit} in + spec comments — RPM expands macros in comment lines; the parameterized + %%cmake macro's multi-line body leaked out of the comment and spawned a + spurious cmake invocation with "宏位置参数坑" as source dir (build 113783) * Tue Oct 20 2026 AI Importer <ai-importer@opencode> - 0.5.0-1 - Initial ROS spec for easynav-regulated-pp-controller (humble) - Source: easynav_plugins humble branch snapshot (commit 703b73a) @@ -1 +1 @@ -02ec9e42ac54d8e95a13c6f1a8916392 703b73ae55bf6a419bf309b26084ca523b063ddf.tar.gz +e8f043ced6b4dbc5138fa047c563c3fe 703b73ae55bf6a419bf309b26084ca523b063ddf.tar.gz |