diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | nav2-planner.spec | 17 | ||||
| -rw-r--r-- | ros-humble-nav2-planner-1.1.9-fix-gcc12-error.patch | 12 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 9 insertions, 23 deletions
@@ -1 +1,2 @@ /ros-humble-nav2-planner_1.1.9.orig.tar.gz +/nav2-planner-1.1.20.tar.gz diff --git a/nav2-planner.spec b/nav2-planner.spec index 2cd9fb2..714480e 100644 --- a/nav2-planner.spec +++ b/nav2-planner.spec @@ -1,21 +1,21 @@ %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-planner -%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-planner-1.1.9-fix-gcc12-error.patch +Source0: %{RosPkgName}-%{version}.tar.gz Requires: ros-%{ros_distro}-rclcpp Requires: ros-%{ros_distro}-rclcpp-action @@ -63,7 +63,7 @@ Provides: %{name}-runtime = %{version}-%{release} TODO %prep -%autosetup -p1 +%autosetup -c -n %{name}-%{version} %build # Needed to bootstrap since the ros_workspace package does not yet exist. @@ -87,7 +87,7 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform} %if !0%{?with_tests} -DBUILD_TESTING=OFF \ %endif - .. + ../%{RosPkgName}-%{version} %make_build @@ -122,8 +122,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 Steve Macenski stevenmacenski@gmail.com - 1.1.6-1 +* Wed Mar 25 2026 Steve Macenski stevenmacenski@gmail.com - 1.1.20-1 - Autogenerated by ros-porting-tools diff --git a/ros-humble-nav2-planner-1.1.9-fix-gcc12-error.patch b/ros-humble-nav2-planner-1.1.9-fix-gcc12-error.patch deleted file mode 100644 index 5d149d7..0000000 --- a/ros-humble-nav2-planner-1.1.9-fix-gcc12-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ros-humble-nav2-planner-1.1.9_org/src/planner_server.cpp ros-humble-nav2-planner-1.1.9/src/planner_server.cpp ---- ros-humble-nav2-planner-1.1.9_org/src/planner_server.cpp 2023-09-11 16:38:07.337876022 +0800 -+++ ros-humble-nav2-planner-1.1.9/src/planner_server.cpp 2023-09-11 16:38:25.934148439 +0800 -@@ -118,7 +118,7 @@ - get_logger(), - "Planner Server has %s planners available.", planner_ids_concat_.c_str()); - -- double expected_planner_frequency; -+ double expected_planner_frequency = 0.0; - get_parameter("expected_planner_frequency", expected_planner_frequency); - if (expected_planner_frequency > 0) { - max_planner_duration_ = 1 / expected_planner_frequency; @@ -1 +1 @@ -0c5af710293feaa41ed5a215c6201a76 ros-humble-nav2-planner_1.1.9.orig.tar.gz +9085977bf14b15ab37a3ef238726a05d nav2-planner-1.1.20.tar.gz |