upd to noetic, cmake vars, python

1 files changed, 16 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7268c0626731..472ec3d5b288 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,32 @@
 pkgdesc="ROS - Generates a configuration package that makes it easy to use MoveIt!."
 url='https://moveit.ros.org'
 
-pkgname='ros-melodic-moveit-setup-assistant'
+pkgname='ros-noetic-moveit-setup-assistant'
 pkgver='1.0.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
-ros_makedepends=(ros-melodic-srdfdom
-  ros-melodic-moveit-core
-  ros-melodic-catkin
-  ros-melodic-moveit-ros-planning
-  ros-melodic-moveit-resources
-  ros-melodic-moveit-ros-visualization)
+ros_makedepends=(ros-noetic-srdfdom
+  ros-noetic-moveit-core
+  ros-noetic-catkin
+  ros-noetic-moveit-ros-planning
+  ros-noetic-moveit-resources
+  ros-noetic-moveit-ros-visualization)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   yaml-cpp)
 
-ros_depends=(ros-melodic-srdfdom
-  ros-melodic-xacro
-  ros-melodic-moveit-core
-  ros-melodic-moveit-ros-planning
-  ros-melodic-moveit-ros-visualization)
+ros_depends=(ros-noetic-srdfdom
+  ros-noetic-xacro
+  ros-noetic-moveit-core
+  ros-noetic-moveit-ros-planning
+  ros-noetic-moveit-ros-visualization)
 depends=(${ros_depends[@]}
   yaml-cpp)
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/moveit_setup_assistant/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/moveit_setup_assistant/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag})
 # sha256sums=('44b21865d318f1cfb13846b72df494b6eb461f814dec78af71f9e7eb6981f537')
@@ -40,21 +40,17 @@ sha256sums=('b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4')
 build() {
   # Use ROS environment variables
   source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+  [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
   # Create build directory
   [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
   cd ${srcdir}/build
 
-  # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
   # Build project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }