upd to noetic, cmake vars, python

2 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c3fb3973818..0b113e3779ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-librviz-tutorial
+pkgbase = ros-noetic-librviz-tutorial
 	pkgdesc = ROS - Tutorial showing how to compile your own C++ program with RViz displays and features.
 	pkgver = 0.10.3
 	pkgrel = 3
@@ -11,15 +11,15 @@ pkgbase = ros-melodic-librviz-tutorial
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-rviz
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-rviz
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-catkin
 	makedepends = qt5-base
-	depends = ros-melodic-rviz
-	depends = ros-melodic-roscpp
+	depends = ros-noetic-rviz
+	depends = ros-noetic-roscpp
 	depends = qt5-base
-	source = ros-melodic-librviz-tutorial-0.10.3.tar.gz::https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz
+	source = ros-noetic-librviz-tutorial-0.10.3.tar.gz::https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz
 	sha256sums = a3162d933fea0dd58b99e46fb71ea5d8596ef6e46eaf3a906e4bf20e9ca1bb1c
 
-pkgname = ros-melodic-librviz-tutorial
+pkgname = ros-noetic-librviz-tutorial
 
diff --git a/PKGBUILD b/PKGBUILD
index 77df98bb0485..44e270ed75ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - Tutorial showing how to compile your own C++ program with RViz displays and features."
 url='https://wiki.ros.org/librviz_tutorial'
 
-pkgname='ros-melodic-librviz-tutorial'
+pkgname='ros-noetic-librviz-tutorial'
 pkgver='0.10.3'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,9 +11,9 @@ pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-rviz
-	ros-melodic-roscpp
-	ros-melodic-catkin
+	ros-noetic-rviz
+	ros-noetic-roscpp
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -24,8 +24,8 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rviz
-	ros-melodic-roscpp
+	ros-noetic-rviz
+	ros-noetic-roscpp
 )
 
 depends=(
@@ -40,21 +40,17 @@ sha256sums=('a3162d933fea0dd58b99e46fb71ea5d8596ef6e46eaf3a906e4bf20e9ca1bb1c')
 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
 }