diff options
| -rw-r--r-- | cartographer-ros-fix-multiple-definition-error.patch | 23 | ||||
| -rw-r--r-- | cartographer-ros.spec | 12 |
2 files changed, 7 insertions, 28 deletions
diff --git a/cartographer-ros-fix-multiple-definition-error.patch b/cartographer-ros-fix-multiple-definition-error.patch deleted file mode 100644 index c5c91b3..0000000 --- a/cartographer-ros-fix-multiple-definition-error.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt_org 2023-05-04 15:53:33.555572652 +0800 -+++ ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt 2023-05-04 15:54:17.268212997 +0800 -@@ -59,20 +59,13 @@ - # Library - add_library(${PROJECT_NAME} - src/assets_writer.cpp -- src/assets_writer_main.cpp - src/map_builder_bridge.cpp - src/msg_conversion.cpp - src/node_constants.cpp - src/node.cpp -- src/node_main.cpp - src/node_options.cpp -- src/occupancy_grid_node_main.cpp - src/offline_node.cpp -- src/offline_node_main.cpp -- src/pbstream_map_publisher_main.cpp -- src/pbstream_to_ros_map_main.cpp - src/playable_bag.cpp -- src/rosbag_validate_main.cpp - src/ros_log_sink.cpp - src/ros_map.cpp - src/ros_map_writing_points_processor.cpp diff --git a/cartographer-ros.spec b/cartographer-ros.spec index 6477627..ade6062 100644 --- a/cartographer-ros.spec +++ b/cartographer-ros.spec @@ -4,12 +4,11 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 2.0.9002 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cartographer is a system that provides real-time simultaneous localization and License: Apache 2.0 URL: https://github.com/ros2/cartographer_ros/tree/ros2 Source0: %{RosPkgName}-%{src_version}.tar.gz -Patch0: cartographer-ros-fix-multiple-definition-error.patch %global debug_package %{nil} %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -86,10 +85,9 @@ Cartographer is a system that provides real-time simultaneous localization %prep %autosetup -n %{RosPkgName}-%{src_version} -%patch0 -p1 %build -source /opt/ros/%{ros_distro}/setup.sh 2>/dev/null || true +[ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH} export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} cd cartographer_ros @@ -105,7 +103,7 @@ mkdir -p .obj && cd .obj make %{?_smp_mflags} %install -source /opt/ros/%{ros_distro}/setup.sh 2>/dev/null || true +[ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH} export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} cd cartographer_ros @@ -116,5 +114,9 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog +* Tue Sep 29 2026 ai-importer <ai-importer@openeuler.org> - 2.0.9002-2 +- Remove obsolete fix-multiple-definition-error patch (already applied upstream) +- Bump Release to avoid NVR conflict with failed EUR SRPM rebuild + * Sun Sep 20 2026 ai-importer <ai-importer@openeuler.org> - 2.0.9002-1 - Initial import (ROS batch) |