upd to noetic, cmake vars, python

2 files changed, 19 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3032644b8ca..bf3ce1e13f36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rosbridge-server
+pkgbase = ros-noetic-rosbridge-server
 	pkgdesc = ROS - A WebSocket interface to rosbridge.
 	pkgver = 0.11.3
 	pkgrel = 2
@@ -7,18 +7,18 @@ pkgbase = ros-melodic-rosbridge-server
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-rosbridge-library
-	depends = ros-melodic-rosbridge-msgs
-	depends = ros-melodic-rosapi
-	depends = ros-melodic-rospy
-	depends = ros-melodic-rosauth
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-rosbridge-library
+	depends = ros-noetic-rosbridge-msgs
+	depends = ros-noetic-rosapi
+	depends = ros-noetic-rospy
+	depends = ros-noetic-rosauth
 	depends = python-autobahn
 	depends = python-backports.ssl
 	depends = python-tornado=4
 	depends = python-twisted
-	source = ros-melodic-rosbridge-server-0.11.3.tar.gz::https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.3.tar.gz
+	source = ros-noetic-rosbridge-server-0.11.3.tar.gz::https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.3.tar.gz
 	sha256sums = 5020616a6589f81fde0dfcd2835bbf4c43ff57bc39b76aefd5ed8f0916af87a5
 
-pkgname = ros-melodic-rosbridge-server
+pkgname = ros-noetic-rosbridge-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 68b970407d44..2c0a6996e2b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 pkgdesc="ROS - A WebSocket interface to rosbridge."
 url='https://wiki.ros.org/rosbridge_server'
 
-pkgname='ros-melodic-rosbridge-server'
+pkgname='ros-noetic-rosbridge-server'
 pkgver='0.11.3'
 arch=('any')
 pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -18,11 +18,11 @@ makedepends=(
 )
 
 ros_depends=(
-    ros-melodic-rosbridge-library
-    ros-melodic-rosbridge-msgs
-    ros-melodic-rosapi
-    ros-melodic-rospy
-    ros-melodic-rosauth
+    ros-noetic-rosbridge-library
+    ros-noetic-rosbridge-msgs
+    ros-noetic-rosapi
+    ros-noetic-rospy
+    ros-noetic-rosauth
 )
 
 depends=(
@@ -40,24 +40,17 @@ sha256sums=('5020616a6589f81fde0dfcd2835bbf4c43ff57bc39b76aefd5ed8f0916af87a5')
 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 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }