upd to noetic, cmake vars, python

2 files changed, 37 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4030d53aac90..641666668014 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-yocs-velocity-smoother
+pkgbase = ros-noetic-yocs-velocity-smoother
 	pkgdesc = ROS - Bound incoming velocity messages according to robot velocity and acceleration limits.
 	pkgver = 0.8.2
 	pkgrel = 3
@@ -12,23 +12,23 @@ pkgbase = ros-melodic-yocs-velocity-smoother
 	makedepends = cmake
 	makedepends = git
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-ecl-threads
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-nav-msgs
-	makedepends = ros-melodic-pluginlib
-	makedepends = ros-melodic-nodelet
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-ecl-threads
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-pluginlib
-	depends = ros-melodic-nodelet
-	source = ros-melodic-yocs-velocity-smoother-0.8.2.tar.gz::https://github.com/yujinrobot/yujin_ocs/archive/0.8.2.tar.gz
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-ecl-threads
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-nav-msgs
+	makedepends = ros-noetic-pluginlib
+	makedepends = ros-noetic-nodelet
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-ecl-threads
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-nav-msgs
+	depends = ros-noetic-pluginlib
+	depends = ros-noetic-nodelet
+	source = ros-noetic-yocs-velocity-smoother-0.8.2.tar.gz::https://github.com/yujinrobot/yujin_ocs/archive/0.8.2.tar.gz
 	sha256sums = cb81a2590558b7513f28ef8f9c9571ba9eeb1cae03d2db4c52b0509a70804001
 
-pkgname = ros-melodic-yocs-velocity-smoother
+pkgname = ros-noetic-yocs-velocity-smoother
 
diff --git a/PKGBUILD b/PKGBUILD
index 7dd808f13a96..f7751c9fa23b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,30 @@
 pkgdesc="ROS - Bound incoming velocity messages according to robot velocity and acceleration limits."
 url='https://wiki.ros.org/yocs_velocity_smoother'
 
-pkgname='ros-melodic-yocs-velocity-smoother'
+pkgname='ros-noetic-yocs-velocity-smoother'
 pkgver='0.8.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
-ros_makedepends=(ros-melodic-roscpp
-  ros-melodic-ecl-threads
-  ros-melodic-geometry-msgs
-  ros-melodic-catkin
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-nav-msgs
-  ros-melodic-pluginlib
-  ros-melodic-nodelet)
+ros_makedepends=(ros-noetic-roscpp
+  ros-noetic-ecl-threads
+  ros-noetic-geometry-msgs
+  ros-noetic-catkin
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-nav-msgs
+  ros-noetic-pluginlib
+  ros-noetic-nodelet)
 makedepends=('cmake' 'git' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-roscpp
-  ros-melodic-ecl-threads
-  ros-melodic-geometry-msgs
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-nav-msgs
-  ros-melodic-pluginlib
-  ros-melodic-nodelet)
+ros_depends=(ros-noetic-roscpp
+  ros-noetic-ecl-threads
+  ros-noetic-geometry-msgs
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-nav-msgs
+  ros-noetic-pluginlib
+  ros-noetic-nodelet)
 depends=(${ros_depends[@]})
 
 _dir="yujin_ocs-${pkgver}/yocs_velocity_smoother"
@@ -35,21 +35,17 @@ sha256sums=('cb81a2590558b7513f28ef8f9c9571ba9eeb1cae03d2db4c52b0509a70804001')
 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
 }