upd to noetic, cmake vars, python

2 files changed, 9 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 115ae1d61c98..c7cbafa237ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-stage
+pkgbase = ros-noetic-stage
 	pkgdesc = ROS - Mobile robot simulator http://rtvhub.com/Stage.
 	pkgver = 4.3.0
 	pkgrel = 3
@@ -13,13 +13,13 @@ pkgbase = ros-melodic-stage
 	makedepends = libtool
 	makedepends = mesa
 	makedepends = pkg-config
-	depends = ros-melodic-catkin
+	depends = ros-noetic-catkin
 	depends = libjpeg-turbo
 	depends = mesa
 	depends = fltk
 	depends = gtk2
-	source = ros-melodic-stage-4.3.0.tar.gz::https://github.com/rtv/Stage/archive/v4.3.0.tar.gz
+	source = ros-noetic-stage-4.3.0.tar.gz::https://github.com/rtv/Stage/archive/v4.3.0.tar.gz
 	sha256sums = f32cb6887146441fd34671975fa81ea76438ce447bc68a0a6a1b62b5233ad2d6
 
-pkgname = ros-melodic-stage
+pkgname = ros-noetic-stage
 
diff --git a/PKGBUILD b/PKGBUILD
index ca4572c58540..811adede1804 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - Mobile robot simulator http://rtvhub.com/Stage."
 url='https://wiki.ros.org/stage'
 
-pkgname='ros-melodic-stage'
+pkgname='ros-noetic-stage'
 pkgver='4.3.0'
 arch=('any')
 pkgrel=3
@@ -19,7 +19,7 @@ makedepends=('cmake' 'ros-build-tools'
   mesa
   pkg-config)
 
-ros_depends=(ros-melodic-catkin)
+ros_depends=(ros-noetic-catkin)
 depends=(${ros_depends[@]}
   libjpeg-turbo
   mesa
@@ -33,21 +33,17 @@ sha256sums=('f32cb6887146441fd34671975fa81ea76438ce447bc68a0a6a1b62b5233ad2d6')
 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
 }