upd to noetic, cmake vars, python

2 files changed, 22 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e055f5d52463..8e053b761e34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-spacenav-node
+pkgbase = ros-noetic-spacenav-node
 	pkgdesc = ROS - ROS interface to the 3Dconnexion SpaceNavigator 6DOF joystick.
 	pkgver = 1.13.0
 	pkgrel = 2
@@ -11,20 +11,20 @@ pkgbase = ros-melodic-spacenav-node
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-sensor-msgs
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-sensor-msgs
 	makedepends = libspnav
 	makedepends = libx11
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-sensor-msgs
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-sensor-msgs
 	depends = spacenavd
 	depends = libspnav
 	depends = libx11
-	source = ros-melodic-spacenav-node-1.13.0.tar.gz::https://github.com/ros-drivers/joystick_drivers/archive/1.13.0.tar.gz
+	source = ros-noetic-spacenav-node-1.13.0.tar.gz::https://github.com/ros-drivers/joystick_drivers/archive/1.13.0.tar.gz
 	sha256sums = bfe0633623f4dc917524198aaea10b1c4603881e736dafb7b652f1af60922ad7
 
-pkgname = ros-melodic-spacenav-node
+pkgname = ros-noetic-spacenav-node
 
diff --git a/PKGBUILD b/PKGBUILD
index 61879f668f7e..8c227bc034d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,31 @@
 pkgdesc="ROS - ROS interface to the 3Dconnexion SpaceNavigator 6DOF joystick."
 url='https://www.wiki.ros.org/spacenav_node'
 
-pkgname='ros-melodic-spacenav-node'
+pkgname='ros-noetic-spacenav-node'
 pkgver='1.13.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-roscpp
-  ros-melodic-geometry-msgs
-  ros-melodic-sensor-msgs)
+ros_makedepends=(ros-noetic-catkin
+  ros-noetic-roscpp
+  ros-noetic-geometry-msgs
+  ros-noetic-sensor-msgs)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   libspnav
   libx11)
 
-ros_depends=(ros-melodic-roscpp
-  ros-melodic-geometry-msgs
-  ros-melodic-sensor-msgs)
+ros_depends=(ros-noetic-roscpp
+  ros-noetic-geometry-msgs
+  ros-noetic-sensor-msgs)
 depends=(${ros_depends[@]}
   spacenavd
   libspnav
   libx11)
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/spacenav_node/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/spacenav_node/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/joystick_drivers-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -40,21 +40,17 @@ sha256sums=('bfe0633623f4dc917524198aaea10b1c4603881e736dafb7b652f1af60922ad7')
 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 2 ${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
 }