diff options
| -rw-r--r-- | easynav-fusion-localizer.spec | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/easynav-fusion-localizer.spec b/easynav-fusion-localizer.spec index dbf7b5e..6eefea3 100644 --- a/easynav-fusion-localizer.spec +++ b/easynav-fusion-localizer.spec @@ -14,8 +14,8 @@ URL: https://github.com/EasyNavigation/easynav_plugins # Source0 命名与批量 driver 的 create_tarball/tar --transform 对齐： # <RosPkgName>-<src_version>.tar.gz，顶层目录同名，prep 解压目录须匹配 Source0: %{RosPkgName}-%{src_version}.tar.gz -# GeographicLib 在 openEuler 为 config-mode 包（GeographicLib-devel 提供 -# /usr/lib64/cmake/GeographicLib/geographiclib-config.cmake），上游 CMakeLists +# GeographicLib 在 openEuler 为 config-mode 包（geographiclib-devel 提供 +# cmake(geographiclib)），上游 CMakeLists # 按 module-mode 查找 /usr/share/cmake/geographiclib/ 会失败，需适配为 # config-mode 优先、module 回退（与 robot-localization package_fix 同源） Patch0: 0001-adapt-GeographicLib-discovery-for-openEuler.patch @@ -58,10 +58,13 @@ BuildRequires: ros-%{ros_distro}-easynav-localizer BuildRequires: ros-%{ros_distro}-easynav-sensors BuildRequires: ros-%{ros_distro}-yaets -# 系统依赖（pkg.remap 映射：eigen→eigen3-devel；geographiclib→GeographicLib-devel， -# openEuler 包名大写 GeographicLib，非 Debian 小写名，§6 反幻觉铁律） +# 系统依赖（pkg.remap 映射：eigen→eigen3-devel） +# geographiclib：eulermaker additional repo（openEuler_Embedded_ROS2_humble_release3） +# 提供 geographiclib / geographiclib-devel（官方小写包名），ros-humble-robot-localization +# 同源 Requires: geographiclib。改用 geographiclib-devel 避免 COPR 的 +# geographiclib-tools-libs 与官方 geographiclib 在 libGeographicLib.so.26.2.1 上冲突 BuildRequires: eigen3-devel -BuildRequires: GeographicLib-devel +BuildRequires: geographiclib-devel # 运行时 Requires（/opt/ros 被 __requires_exclude_from 豁免，autodeps 扫不到，必须手写） # 三件套之 ros-workspace（setup.sh / 环境 hooks）+ ament-cmake（ament 运行期钩子） @@ -87,7 +90,8 @@ Requires: ros-%{ros_distro}-easynav-localizer Requires: ros-%{ros_distro}-easynav-sensors Requires: ros-%{ros_distro}-yaets # fusion_localizer.so 直接链接 ${GeographicLib_LIBRARIES}，显式声明运行时依赖 -Requires: GeographicLib +# 与 ros-humble-robot-localization 一致使用官方 geographiclib（非 COPR 的 GeographicLib） +Requires: geographiclib # eigen 为 header-only 模板库（编译期嵌入），不在此单列 Requires # 单包策略：ROS 包严禁拆实体子包，改用虚拟 Provides 别名（§7） |