upd to noetic, cmake vars, python

1 files changed, 18 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f1169518dd2e..1371bad08b3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,28 @@
 pkgdesc="ROS - Message and service data structures for interacting with Gazebo from ROS."
 url='https://wiki.ros.org/gazebo_msgs'
 
-pkgname='ros-melodic-gazebo-msgs'
+pkgname='ros-noetic-gazebo-msgs'
 pkgver='2.8.6'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-std-msgs
-  ros-melodic-trajectory-msgs
-  ros-melodic-catkin
-  ros-melodic-std-srvs
-  ros-melodic-geometry-msgs
-  ros-melodic-message-generation
-  ros-melodic-sensor-msgs)
+ros_makedepends=(ros-noetic-std-msgs
+  ros-noetic-trajectory-msgs
+  ros-noetic-catkin
+  ros-noetic-std-srvs
+  ros-noetic-geometry-msgs
+  ros-noetic-message-generation
+  ros-noetic-sensor-msgs)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-std-msgs
-  ros-melodic-trajectory-msgs
-  ros-melodic-sensor-msgs
-  ros-melodic-std-srvs
-  ros-melodic-geometry-msgs
-  ros-melodic-message-runtime)
+ros_depends=(ros-noetic-std-msgs
+  ros-noetic-trajectory-msgs
+  ros-noetic-sensor-msgs
+  ros-noetic-std-srvs
+  ros-noetic-geometry-msgs
+  ros-noetic-message-runtime)
 depends=(${ros_depends[@]})
 
 _dir="gazebo_ros_pkgs-${pkgver}/gazebo_msgs"
@@ -36,26 +36,22 @@ 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
 
   # Patch a file after compilation
-  cd "${srcdir}/build/devel/lib/python3.8/site-packages/gazebo_msgs/srv/"
+  cd "${srcdir}/build/devel/lib/python.8/site-packages/gazebo_msgs/srv/"
   patch -uN _SpawnModel.py ${srcdir}/../spawn_model.patch || return 1
 }