diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | nav2-behaviors.spec | 18 | ||||
| -rw-r--r-- | ros-humble-nav2-behaviors-1.1.20-fix-gcc12-error.patch (renamed from ros-humble-nav2-behaviors-1.1.9-fix-gcc12-error.patch) | 9 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 15 insertions, 15 deletions
@@ -1 +1,2 @@ /ros-humble-nav2-behaviors_1.1.9.orig.tar.gz +/nav2-behaviors-1.1.20.tar.gz diff --git a/nav2-behaviors.spec b/nav2-behaviors.spec index 9d6b412..26faa9a 100644 --- a/nav2-behaviors.spec +++ b/nav2-behaviors.spec @@ -1,21 +1,22 @@ %bcond_without tests %bcond_without weak_deps +%define ros_distro humble + %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %global __provides_exclude_from ^/opt/ros/%{ros_distro}/.*$ %global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$ %define RosPkgName nav2-behaviors -%define ros_distro humble Name: ros-%{ros_distro}-%{RosPkgName} -Version: 1.1.9 +Version: 1.1.20 Release: 1%{?dist}%{?release_suffix} Summary: TODO License: Apache-2.0 -Source0: %{name}_%{version}.orig.tar.gz -Patch0: ros-humble-nav2-behaviors-1.1.9-fix-gcc12-error.patch +Source0: %{RosPkgName}-%{version}.tar.gz +Patch0: ros-humble-nav2-behaviors-1.1.20-fix-gcc12-error.patch Requires: ros-%{ros_distro}-rclcpp Requires: ros-%{ros_distro}-rclcpp-action @@ -61,7 +62,7 @@ Provides: %{name}-runtime = %{version}-%{release} TODO %prep -%autosetup -p1 +%autosetup -c -n %{name}-%{version} -p1 %build # Needed to bootstrap since the ros_workspace package does not yet exist. @@ -85,7 +86,7 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform} %if !0%{?with_tests} -DBUILD_TESTING=OFF \ %endif - .. + ../%{RosPkgName}-%{version} %make_build @@ -120,8 +121,5 @@ else echo "RPM TESTS SKIPPED"; fi /opt/ros/%{ros_distro} %changelog -* Mon Sep 11 2023 will_niutao <niutao2@huawei.com> - 1.1.9-1 -- update version and fix compile error with gcc12 - -* Thu May 04 2023 Carlos Orduno carlos.a.orduno@intel.com - 1.1.6-1 +* Wed Mar 25 2026 Carlos Orduno carlos.a.orduno@intel.com - 1.1.20-1 - Autogenerated by ros-porting-tools diff --git a/ros-humble-nav2-behaviors-1.1.9-fix-gcc12-error.patch b/ros-humble-nav2-behaviors-1.1.20-fix-gcc12-error.patch index 2375c31..eb0a37e 100644 --- a/ros-humble-nav2-behaviors-1.1.9-fix-gcc12-error.patch +++ b/ros-humble-nav2-behaviors-1.1.20-fix-gcc12-error.patch @@ -1,7 +1,8 @@ -diff -Naur ros-humble-nav2-behaviors-1.1.9_org/src/behavior_server.cpp ros-humble-nav2-behaviors-1.1.9/src/behavior_server.cpp ---- ros-humble-nav2-behaviors-1.1.9_org/src/behavior_server.cpp 2023-09-11 14:34:51.041527892 +0800 -+++ ros-humble-nav2-behaviors-1.1.9/src/behavior_server.cpp 2023-09-11 14:35:46.370338402 +0800 -@@ -77,7 +77,7 @@ +diff --git a/src/behavior_server.cpp b/src/behavior_server.cpp +index d6f7568..0d2c4ae 100644 +--- a/src/behavior_server.cpp ++++ b/src/behavior_server.cpp +@@ -77,7 +77,7 @@ BehaviorServer::on_configure(const rclcpp_lifecycle::State & /*state*/) transform_listener_ = std::make_shared<tf2_ros::TransformListener>(*tf_); std::string costmap_topic, footprint_topic, robot_base_frame; @@ -1 +1 @@ -b4f713816a40311fb5d9c101faaf1752 ros-humble-nav2-behaviors_1.1.9.orig.tar.gz +4b7d7ab076dce4f70891233348db6a15 nav2-behaviors-1.1.20.tar.gz |