moveit: tune and harmonize filename

recipes-ros/moveit/moveit-core_0.7.8.bb

@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de
 
 DEPENDS = "roslib boost eigen-conversions fcl octomap eigen-stl-containers geometric-shapes kdl-parser moveit-msgs srdfdom cmake-modules"
 
-require moveit-${PV}.inc
+require moveit.inc

recipes-ros/moveit/moveit-ros-perception_0.7.8.bb

@@ -3,15 +3,14 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-
 DEPENDS = "moveit-core tf-conversions image-transport cv-bridge"
 
-require moveit-${PV}.inc
+require moveit.inc
 
 ROS_BPN = "moveit_ros/perception"
 
-SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz \
-           file://0001-moveit_ros_perception-make-OpenGL-parts-optional.patch \
-           file://0002-Add-C-11-support-for-moveit_ros_perception-and-movei.patch \
+SRC_URI += "file://0001-moveit_ros_perception-make-OpenGL-parts-optional.patch \
+            file://0002-Add-C-11-support-for-moveit_ros_perception-and-movei.patch \
            "
+
 EXTRA_OECMAKE_append = " -DBUILD_OPENGL=OFF"

recipes-ros/moveit/moveit-ros-planning_0.7.8.bb

@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9de
 
 DEPENDS = "moveit-core moveit-ros-perception dynamic-reconfigure ${PYTHON_PN}-rospkg libtinyxml"
 
-require moveit-${PV}.inc
+require moveit.inc
 
 ROS_BPN = "moveit_ros/planning"
 
-SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz \
-           file://0001-address-gcc6-build-error.patch \
-           "
+SRC_URI += "file://0001-address-gcc6-build-error.patch"
+
 FILES_${PN} += "${ros_libdir}/moveit_ros_planning/*"