From eaa290a657fceafe623176d908fa1827db18638e Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Tue, 29 Sep 2026 04:09:19 +0000 Subject: automatic import of ros-humble-cartographer-ros --- cartographer-ros.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cartographer-ros.spec') 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 - 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 - 2.0.9002-1 - Initial import (ROS batch) -- cgit v1.2.3