diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | nav2-waypoint-follower.spec | 17 | ||||
| -rw-r--r-- | ros-humble-nav2-waypoint-follower-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-waypoint-follower_1.1.9.orig.tar.gz +/nav2-waypoint-follower-1.1.20.tar.gz diff --git a/nav2-waypoint-follower.spec b/nav2-waypoint-follower.spec index 5c77db6..8fb395d 100644 --- a/nav2-waypoint-follower.spec +++ b/nav2-waypoint-follower.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-waypoint-follower -%define ros_distro humble Name: ros-%{ros_distro}-%{RosPkgName} -Version: 1.1.9 +Version: 1.1.20 Release: 1%{?dist}%{?release_suffix} Summary: A waypoint follower navigation server License: Apache-2.0 -Source0: %{name}_%{version}.orig.tar.gz -Patch0: ros-humble-nav2-waypoint-follower-1.1.9-fix-gcc12-error.patch +Source0: %{RosPkgName}-%{version}.tar.gz Requires: ros-%{ros_distro}-nav2-common Requires: ros-%{ros_distro}-cv-bridge @@ -61,7 +61,7 @@ Provides: %{name}-runtime = %{version}-%{release} A waypoint follower navigation server %prep -%autosetup -p1 +%autosetup -c -n %{name}-%{version} %build # Needed to bootstrap since the ros_workspace package does not yet exist. @@ -85,7 +85,7 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform} %if !0%{?with_tests} -DBUILD_TESTING=OFF \ %endif - .. + ../%{RosPkgName}-%{version} %make_build @@ -120,8 +120,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-waypoint-follower-1.1.9-fix-gcc12-error.patch b/ros-humble-nav2-waypoint-follower-1.1.9-fix-gcc12-error.patch deleted file mode 100644 index 7f6b766..0000000 --- a/ros-humble-nav2-waypoint-follower-1.1.9-fix-gcc12-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ros-humble-nav2-waypoint-follower-1.1.9_org/plugins/input_at_waypoint.cpp ros-humble-nav2-waypoint-follower-1.1.9/plugins/input_at_waypoint.cpp ---- ros-humble-nav2-waypoint-follower-1.1.9_org/plugins/input_at_waypoint.cpp 2023-09-11 16:38:47.194459880 +0800 -+++ ros-humble-nav2-waypoint-follower-1.1.9/plugins/input_at_waypoint.cpp 2023-09-11 16:39:58.863509758 +0800 -@@ -49,7 +49,7 @@ - logger_ = node->get_logger(); - clock_ = node->get_clock(); - -- double timeout; -+ double timeout = 0.0; - std::string input_topic; - nav2_util::declare_parameter_if_not_declared( - node, plugin_name + ".timeout", @@ -1 +1 @@ -37c967693e25e41a0848cc928f6d5d42 ros-humble-nav2-waypoint-follower_1.1.9.orig.tar.gz +8a833d53ff158b8095eb77ce535953fc nav2-waypoint-follower-1.1.20.tar.gz |