upd to noetic, cmake vars, python

1 files changed, 9 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a8a4456ec224..8cc7d9c1903b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,20 @@
 pkgdesc="ROS - Interface for using ROS with the Gazebo simulator."
 url='https://wiki.ros.org/gazebo_ros_pkgs'
 
-pkgname='ros-melodic-gazebo-ros-pkgs'
+pkgname='ros-noetic-gazebo-ros-pkgs'
 pkgver='2.8.6'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD,LGPL,Apache 2.0')
 
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-gazebo-msgs
-  ros-melodic-gazebo-ros
-  ros-melodic-gazebo-plugins
-  ros-melodic-gazebo-dev)
+ros_depends=(ros-noetic-gazebo-msgs
+  ros-noetic-gazebo-ros
+  ros-noetic-gazebo-plugins
+  ros-noetic-gazebo-dev)
 depends=(${ros_depends[@]})
 
 _dir="gazebo_ros_pkgs-${pkgver}/gazebo_ros_pkgs"
@@ -26,21 +26,17 @@ sha256sums=('df928fbeebd277b8eedf7eb367ab88631de71ef6c552424731eaf855186bc4b4')
 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
 }