summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2026-10-08 11:28:38 +0000
committerCoprDistGit <infra@openeuler.org>2026-10-08 11:28:38 +0000
commited1ea2475427f415ed88b3dc6453d629cfe36ff9 (patch)
treec3424c04b87064e442650a0c0faa017a4ef9df3a
parent3c3cea574379714dc96cb4a301d55d6920c92991 (diff)
automatic import of ros-humble-nebula-core-rosopeneuler24.03_LTS_SP3
-rw-r--r--nebula-core-ros.spec10
1 files changed, 9 insertions, 1 deletions
diff --git a/nebula-core-ros.spec b/nebula-core-ros.spec
index d0b4d1b..60adc83 100644
--- a/nebula-core-ros.spec
+++ b/nebula-core-ros.spec
@@ -6,7 +6,7 @@
Name: ros-%{ros_distro}-%{RosPkgName}
Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Nebula ROS Base Libraries
License: Apache-2.0
URL: https://github.com/tier4/nebula
@@ -39,6 +39,9 @@ BuildRequires: ros-%{ros_distro}-rosbag2-storage
BuildRequires: ros-%{ros_distro}-nebula-core-common
# 系统依赖(pkg.remap: boost -> boost-devel)
BuildRequires: boost-devel
+# nebula_core_common 通过 CMake 传递依赖 find_package(nlohmann_json),
+# 构建环境需安装 nlohmann-json-devel 提供 nlohmann_jsonConfig.cmake(pkg.remap: nlohmann-json-dev -> nlohmann-json-devel)
+BuildRequires: nlohmann-json-devel
# 运行时 Requires:/opt/ros 被 __requires_exclude_from 豁免、autodeps 扫不到,必须手写(§6)
Requires: ros-%{ros_distro}-ros-workspace
@@ -49,6 +52,7 @@ Requires: ros-%{ros_distro}-diagnostic-updater
Requires: ros-%{ros_distro}-rosbag2-storage
Requires: ros-%{ros_distro}-nebula-core-common
Requires: boost-devel
+Requires: nlohmann-json-devel
# 单包策略:禁止拆实体子包,改用虚拟别名兼容依赖方(§7)
Provides: %{name}-devel = %{version}-%{release}
@@ -92,6 +96,10 @@ cd src/nebula_core/nebula_core_ros/.obj
/opt/ros/%{ros_distro}
%changelog
+* Thu Oct 08 2026 AI Importer <ai-importer@openeuler.org> - 1.2.0-3
+- 修复 %build 失败:nebula_core_common CMake 传递依赖 find_package(nlohmann_json)
+ 找不到配置文件,补 nlohmann-json-devel 到 BuildRequires/Requires
+
* Thu Oct 08 2026 AI Importer <ai-importer@openeuler.org> - 1.2.0-2
- 修复 %prep 失败:Source0 加 #/ 强制重定向 tarball 文件名,
%autosetup -n 与 driver/submit_fix 的目录名 nebula-core-ros-<version> 对齐