diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | nav2-constrained-smoother.spec | 17 | ||||
| -rw-r--r-- | ros-humble-nav2-constrained-smoother-1.1.9-fix-gcc12-compile-error.patch | 12 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 9 insertions, 23 deletions
@@ -1 +1,2 @@ /ros-humble-nav2-constrained-smoother_1.1.9.orig.tar.gz +/nav2-constrained-smoother-1.1.20.tar.gz diff --git a/nav2-constrained-smoother.spec b/nav2-constrained-smoother.spec index 13abeda..c68cad7 100644 --- a/nav2-constrained-smoother.spec +++ b/nav2-constrained-smoother.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-constrained-smoother -%define ros_distro humble Name: ros-%{ros_distro}-%{RosPkgName} -Version: 1.1.9 +Version: 1.1.20 Release: 1%{?dist}%{?release_suffix} Summary: Ceres constrained smoother License: Apache-2.0 -Source0: %{name}_%{version}.orig.tar.gz -Patch0: ros-humble-nav2-constrained-smoother-1.1.9-fix-gcc12-compile-error.patch +Source0: %{RosPkgName}-%{version}.tar.gz Requires: ros-%{ros_distro}-nav2-common Requires: ros-%{ros_distro}-angles @@ -55,7 +55,7 @@ Provides: %{name}-runtime = %{version}-%{release} Ceres constrained smoother %prep -%autosetup -p1 +%autosetup -c -n %{name}-%{version} %build # Needed to bootstrap since the ros_workspace package does not yet exist. @@ -79,7 +79,7 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform} %if !0%{?with_tests} -DBUILD_TESTING=OFF \ %endif - .. + ../%{RosPkgName}-%{version} %make_build @@ -114,8 +114,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 Matej Vargovcik vargovcik@robotechvision.com - 1.1.6-1 +* Wed Mar 25 2026 Matej Vargovcik vargovcik@robotechvision.com - 1.1.20-1 - Autogenerated by ros-porting-tools diff --git a/ros-humble-nav2-constrained-smoother-1.1.9-fix-gcc12-compile-error.patch b/ros-humble-nav2-constrained-smoother-1.1.9-fix-gcc12-compile-error.patch deleted file mode 100644 index 4742e57..0000000 --- a/ros-humble-nav2-constrained-smoother-1.1.9-fix-gcc12-compile-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ros-humble-nav2-constrained-smoother-1.1.9_org/include/nav2_constrained_smoother/smoother.hpp ros-humble-nav2-constrained-smoother-1.1.9/include/nav2_constrained_smoother/smoother.hpp ---- ros-humble-nav2-constrained-smoother-1.1.9_org/include/nav2_constrained_smoother/smoother.hpp 2023-09-11 19:06:58.704711382 +0800 -+++ ros-humble-nav2-constrained-smoother-1.1.9/include/nav2_constrained_smoother/smoother.hpp 2023-09-11 19:09:44.435139162 +0800 -@@ -292,7 +292,7 @@ - } - int last_i = 0; - int prelast_i = -1; -- Eigen::Vector2d prelast_dir; -+ Eigen::Vector2d prelast_dir(0.0, 0.0); - for (int i = 1; i <= static_cast<int>(path_optim.size()); i++) { - if (i == static_cast<int>(path_optim.size()) || optimized[i]) { - if (prelast_i != -1) { @@ -1 +1 @@ -85aaaca5231a0ef78fcd365a17eae25b ros-humble-nav2-constrained-smoother_1.1.9.orig.tar.gz +7da6f5d3024bc975eec7b98a073b5008 nav2-constrained-smoother-1.1.20.tar.gz |