upd to noetic, cmake vars, python

2 files changed, 21 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 392f9aa074b6..e44646cbd9ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-nodelet-tutorial-math
+pkgbase = ros-noetic-nodelet-tutorial-math
 	pkgdesc = ROS - Package for Nodelet tutorial.
 	pkgver = 0.1.11
 	pkgrel = 3
@@ -11,15 +11,15 @@ pkgbase = ros-melodic-nodelet-tutorial-math
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-nodelet
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-nodelet
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-roscpp
-	source = ros-melodic-nodelet-tutorial-math-0.1.11.tar.gz::https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz
+	makedepends = ros-noetic-nodelet
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-nodelet
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-roscpp
+	source = ros-noetic-nodelet-tutorial-math-0.1.11.tar.gz::https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz
 	sha256sums = e6015c289219df58253809254baa53dbf2f3190b61d77fac2b2fb8b8c12f3ec1
 
-pkgname = ros-melodic-nodelet-tutorial-math
+pkgname = ros-noetic-nodelet-tutorial-math
 
diff --git a/PKGBUILD b/PKGBUILD
index 9ea7ead3b14d..f5c4cfc064f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - Package for Nodelet tutorial."
 url='https://www.wiki.ros.org/nodelet_tutorial_math'
 
-pkgname='ros-melodic-nodelet-tutorial-math'
+pkgname='ros-noetic-nodelet-tutorial-math'
 pkgver='0.1.11'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,10 +11,10 @@ pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-nodelet
-	ros-melodic-std-msgs
-	ros-melodic-roscpp
-	ros-melodic-catkin
+	ros-noetic-nodelet
+	ros-noetic-std-msgs
+	ros-noetic-roscpp
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -24,9 +24,9 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-nodelet
-	ros-melodic-std-msgs
-	ros-melodic-roscpp
+	ros-noetic-nodelet
+	ros-noetic-std-msgs
+	ros-noetic-roscpp
 )
 
 depends=(
@@ -40,21 +40,17 @@ sha256sums=('e6015c289219df58253809254baa53dbf2f3190b61d77fac2b2fb8b8c12f3ec1')
 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 the 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 the 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
 }