automatic import of moveit-core

2 files changed, 17 insertions, 21 deletions

diff --git a/moveit-core-fix-generate-parameter-library-include-path.patch b/moveit-core-fix-generate-parameter-library-include-path.patch
index e1b744c..a289aed 100644
--- a/moveit-core-fix-generate-parameter-library-include-path.patch
+++ b/moveit-core-fix-generate-parameter-library-include-path.patch
@@ -1,5 +1,18 @@
+diff --git a/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp b/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
+index 59c628c..033bcfb 100644
+--- a/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
++++ b/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
+@@ -78,7 +78,7 @@ c --------x--- v   |
+ #include <moveit/robot_model/robot_model.hpp>
+ #include <moveit/robot_state/robot_state.hpp>
+ #include <moveit/utils/logger.hpp>
+-#include <moveit_core/moveit_acceleration_filter_parameters.hpp>
++#include <moveit_acceleration_filter_parameters.hpp>
+ 
+ #include <osqp.h>
+ #include <cstddef>  // for size_t
 diff --git a/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp b/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp
-index 1234567..89abcdef 100644
+index ae153fb..7622229 100644
 --- a/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp
 +++ b/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp
 @@ -43,7 +43,7 @@
@@ -11,25 +24,11 @@ index 1234567..89abcdef 100644
  
  namespace online_signal_smoothing
  {
-diff --git a/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp b/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
-index 1234567..89abcdef 100644
---- a/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
-+++ b/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp
-@@ -78,7 +78,7 @@
- #include <moveit/online_signal_smoothing/smoothing_base_class.hpp>
- #include <moveit/robot_model/robot_model.hpp>
- #include <moveit/robot_state/robot_state.hpp>
- #include <moveit/utils/logger.hpp>
--#include <moveit_core/moveit_acceleration_filter_parameters.hpp>
-+#include <moveit_acceleration_filter_parameters.hpp>
- 
- #include <osqp.h>
- #include <cstddef>  // for size_t
 diff --git a/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp b/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp
-index 1234567..89abcdef 100644
+index f5fddba..db523cf 100644
 --- a/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp
 +++ b/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ Description: Applies jerk/acceleration/velocity limits to online motion commands
  
  #include <moveit/robot_model/robot_model.hpp>
  #include <moveit/online_signal_smoothing/smoothing_base_class.hpp>
diff --git a/moveit-core.spec b/moveit-core.spec
index 540ecda..4614e41 100644
--- a/moveit-core.spec
+++ b/moveit-core.spec
@@ -121,10 +121,7 @@ Provides:       %{name}-runtime = %{version}-%{release}
 Core libraries used by MoveIt
 
 %prep
-%setup -q -c -n moveit-core-2.5.9
-pushd moveit-core-2.5.9
-%patch0 -p1
-popd
+%autosetup -p1
 
 %build
 # Needed to bootstrap since the ros_workspace package does not yet exist.