summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2026-10-12 09:52:26 +0000
committerCoprDistGit <infra@openeuler.org>2026-10-12 09:52:26 +0000
commit3051eaed996354dece839a46dacf6db58e167916 (patch)
tree917efde6d747fe483f8e9e449cdb3f1fa7837a9b
parentc74f452376642081f22e9e9193f2d6f3a1af6cc9 (diff)
automatic import of ros-humble-mavros-extras
-rw-r--r--ros-humble-mavros-extras.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/ros-humble-mavros-extras.spec b/ros-humble-mavros-extras.spec
index a812086..5227a89 100644
--- a/ros-humble-mavros-extras.spec
+++ b/ros-humble-mavros-extras.spec
@@ -4,7 +4,7 @@
Name: ros-%{ros_distro}-%{RosPkgName}
Version: 2.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Extra nodes and plugins for MAVROS
License: GPLv3 and LGPLv3 and BSD
@@ -61,8 +61,11 @@ BuildRequires: ros-%{ros_distro}-yaml-cpp-vendor
# --- System (non-ROS) build dependencies ---
BuildRequires: eigen3-devel
BuildRequires: yaml-cpp-devel
+# geographiclib-devel pulls in official geographiclib (provides /usr/bin/GeoConvert
+# etc. + FindGeographicLib.cmake + headers); do NOT add separate geographiclib-tools —
+# the in-session built geographiclib-tools-2.7.0 ships the same /usr/bin/* and causes
+# a file-conflict transaction-test failure.
BuildRequires: geographiclib-devel
-BuildRequires: geographiclib-tools
BuildRequires: python3-click
# --- Runtime requires (ROS-specific, autodeps disabled) ---
@@ -142,6 +145,11 @@ cd mavros_extras/.obj
/opt/ros/%{ros_distro}
%changelog
+* Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-2
+- Drop BuildRequires: geographiclib-tools: it duplicates /usr/bin/* tools
+ already provided by official geographiclib (pulled by geographiclib-devel),
+ causing a dnf transaction-test file conflict.
+
* Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-1
- Initial package for openEuler (ROS 2 humble)
- Built from upstream mavros repo, mavros_extras sub-package