summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2026-04-14 03:38:32 +0000
committerCoprDistGit <infra@openeuler.org>2026-04-14 03:38:32 +0000
commit7cc89dba1ed2e43f3802737ea4b92e8544948be0 (patch)
treec20d46b49e49d4b3679c3585f8971a91b85b555d
parent0aaf4b690cbe3bc7b4313d9ca4abbfe06bc43e0a (diff)
automatic import of moveit-simple-controller-manager
-rw-r--r--moveit-simple-controller-manager-remove-parallel-gripper-command.patch49
-rw-r--r--moveit-simple-controller-manager.spec17
-rw-r--r--sources2
3 files changed, 10 insertions, 58 deletions
diff --git a/moveit-simple-controller-manager-remove-parallel-gripper-command.patch b/moveit-simple-controller-manager-remove-parallel-gripper-command.patch
deleted file mode 100644
index d875987..0000000
--- a/moveit-simple-controller-manager-remove-parallel-gripper-command.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/moveit_simple_controller_manager.cpp b/src/moveit_simple_controller_manager.cpp
---- a/src/moveit_simple_controller_manager.cpp
-+++ b/src/moveit_simple_controller_manager.cpp
-@@ -37,7 +37,6 @@
-
- #include <moveit_simple_controller_manager/action_based_controller_handle.hpp>
- #include <moveit_simple_controller_manager/gripper_command_controller_handle.hpp>
--#include <moveit_simple_controller_manager/parallel_gripper_command_controller_handle.hpp>
- #include <moveit_simple_controller_manager/follow_joint_trajectory_controller_handle.hpp>
- #include <boost/algorithm/string/join.hpp>
- #include <pluginlib/class_list_macros.hpp>
-@@ -182,37 +181,6 @@
- RCLCPP_INFO_STREAM(getLogger(), "Added GripperCommand controller for " << controller_name);
- controllers_[controller_name] = new_handle;
- }
-- else if (type == "ParallelGripperCommand")
-- {
-- double max_effort;
-- node_->get_parameter_or(makeParameterName(PARAM_BASE_NAME, controller_name, "max_effort"), max_effort, 0.0);
-- if (max_effort > 0.0)
-- {
-- RCLCPP_INFO_STREAM(getLogger(), controller_name << " will command a max effort of: " << max_effort);
-- }
--
-- double max_velocity;
-- node_->get_parameter_or(makeParameterName(PARAM_BASE_NAME, controller_name, "max_velocity"), max_velocity,
-- 0.0);
-- if (max_effort > 0.0)
-- {
-- RCLCPP_INFO_STREAM(getLogger(), controller_name << " will command a max velocity of: " << max_velocity);
-- }
--
-- new_handle = std::make_shared<ParallelGripperCommandControllerHandle>(node_, controller_name, action_ns,
-- max_effort, max_velocity);
--
-- if (controller_joints.size() > 1)
-- {
-- RCLCPP_WARN_STREAM(getLogger(), "ParallelGripperCommand controller only supports commanding a single joint "
-- "and multiple joint names were specified. Assuming control of joint: "
-- << controller_joints[0]);
-- }
-- static_cast<ParallelGripperCommandControllerHandle*>(new_handle.get())->setCommandJoint(controller_joints[0]);
--
-- RCLCPP_INFO_STREAM(getLogger(), "Added ParallelGripperCommand controller for " << controller_name);
-- controllers_[controller_name] = new_handle;
-- }
- else if (type == "FollowJointTrajectory")
- {
- new_handle = std::make_shared<FollowJointTrajectoryControllerHandle>(node_, controller_name, action_ns);
diff --git a/moveit-simple-controller-manager.spec b/moveit-simple-controller-manager.spec
index b66fa5c..904746b 100644
--- a/moveit-simple-controller-manager.spec
+++ b/moveit-simple-controller-manager.spec
@@ -1,4 +1,4 @@
-%bcond_without tests
+%bcond_with tests
%bcond_without weak_deps
%define ros_distro humble
@@ -11,13 +11,12 @@
Name: ros-%{ros_distro}-%{RosPkgName}
Version: 2.5.9
-Release: 1%{?dist}%{?release_suffix}
+Release: 3%{?dist}%{?release_suffix}
Summary: A generic, simple controller manager plugin for MoveIt.
-Url: http://moveit.ros.org
-License: BSD-3-Clause
+Url: http://moveit.ai
+License: BSD
Source0: %{RosPkgName}-%{version}.tar.gz
-Patch0: moveit-simple-controller-manager-remove-parallel-gripper-command.patch
Requires: ros-%{ros_distro}-moveit-common
Requires: ros-%{ros_distro}-moveit-core
@@ -37,6 +36,8 @@ BuildRequires: ros-%{ros_distro}-ament-cmake
BuildRequires: ros-%{ros_distro}-ros-workspace
%if 0%{?with_tests}
+BuildRequires: ros-%{ros_distro}-ament-lint-auto
+BuildRequires: ros-%{ros_distro}-ament-lint-common
%endif
Provides: %{name}-devel = %{version}-%{release}
@@ -47,7 +48,7 @@ Provides: %{name}-runtime = %{version}-%{release}
A generic, simple controller manager plugin for MoveIt.
%prep
-%autosetup -p1 -n %{RosPkgName}-%{version}
+%autosetup -c -n %{name}-%{version}
%build
# Needed to bootstrap since the ros_workspace package does not yet exist.
@@ -71,7 +72,7 @@ mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform}
%if !0%{?with_tests}
-DBUILD_TESTING=OFF \
%endif
- ..
+ ../%{RosPkgName}-%{version}
%make_build
@@ -106,5 +107,5 @@ else echo "RPM TESTS SKIPPED"; fi
/opt/ros/%{ros_distro}
%changelog
-* Thu Apr 09 2026 Michael Görner me@v4hn.de - 2.5.9-1
+* Tue Apr 14 2026 Michael Görner me@v4hn.de - 2.5.9-1
- Autogenerated by ros-porting-tools
diff --git a/sources b/sources
index 4540a66..8756ffa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e20f98ed395909b1bc3a3cc81db44118 moveit-simple-controller-manager-2.5.9.tar.gz
+8d918972d5e30dca79f987f5165f07cc moveit-simple-controller-manager-2.5.9.tar.gz