upd to noetic, cmake vars, python

2 files changed, 23 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 362c3e05acfd..74f6e3b11c67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-turtlebot3-gazebo
+pkgbase = ros-noetic-turtlebot3-gazebo
 	pkgdesc = ROS - Gazebo simulation package for the TurtleBot3
 	pkgver = 1.2.0
 	pkgrel = 2
@@ -11,17 +11,17 @@ pkgbase = ros-melodic-turtlebot3-gazebo
 	license = Apache-2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-catkin
 	depends = gazebo
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-tf
-	depends = ros-melodic-gazebo-ros
-	source = ros-melodic-turtlebot3-gazebo-1.2.0.tar.gz::https://github.com/ROBOTIS-GIT/turtlebot3_simulations/archive/1.2.0.tar.gz
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-nav-msgs
+	depends = ros-noetic-tf
+	depends = ros-noetic-gazebo-ros
+	source = ros-noetic-turtlebot3-gazebo-1.2.0.tar.gz::https://github.com/ROBOTIS-GIT/turtlebot3_simulations/archive/1.2.0.tar.gz
 	sha256sums = 6fbb4cf74b9777c3be3a751dd8d638df2570dd4478681b5eadf51dee32f57c5b
 
-pkgname = ros-melodic-turtlebot3-gazebo
+pkgname = ros-noetic-turtlebot3-gazebo
 
diff --git a/PKGBUILD b/PKGBUILD
index 1102b479593e..8816b9b7827b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 pkgdesc="ROS - Gazebo simulation package for the TurtleBot3"
 url='https://wiki.ros.org/turtlebot3_gazebo'
 
-pkgname='ros-melodic-turtlebot3-gazebo'
+pkgname='ros-noetic-turtlebot3-gazebo'
 pkgver='1.2.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('Apache-2.0')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -18,13 +18,13 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-roscpp
-	ros-melodic-std-msgs
-	ros-melodic-sensor-msgs
-	ros-melodic-geometry-msgs
-	ros-melodic-nav-msgs
-	ros-melodic-tf
-    ros-melodic-gazebo-ros
+	ros-noetic-roscpp
+	ros-noetic-std-msgs
+	ros-noetic-sensor-msgs
+	ros-noetic-geometry-msgs
+	ros-noetic-nav-msgs
+	ros-noetic-tf
+    ros-noetic-gazebo-ros
 )
 
 depends=(
@@ -39,21 +39,17 @@ sha256sums=('6fbb4cf74b9777c3be3a751dd8d638df2570dd4478681b5eadf51dee32f57c5b')
 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
 }