upd to noetic, cmake vars, python

2 files changed, 21 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62b9d0c5ddd9..a32dadec822b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-tf2-tools
+pkgbase = ros-noetic-tf2-tools
 	pkgdesc = ROS - tf2_tools.
 	pkgver = 0.6.5
 	pkgrel = 1
@@ -7,15 +7,15 @@ pkgbase = ros-melodic-tf2-tools
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-tf2-msgs
-	makedepends = ros-melodic-tf2
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf2-ros
-	depends = ros-melodic-tf2-msgs
-	depends = ros-melodic-tf2
-	depends = ros-melodic-tf2-ros
-	source = ros-melodic-tf2-tools-0.6.5.tar.gz::https://github.com/ros/geometry2/archive/0.6.5.tar.gz
+	makedepends = ros-noetic-tf2-msgs
+	makedepends = ros-noetic-tf2
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-tf2-ros
+	depends = ros-noetic-tf2-msgs
+	depends = ros-noetic-tf2
+	depends = ros-noetic-tf2-ros
+	source = ros-noetic-tf2-tools-0.6.5.tar.gz::https://github.com/ros/geometry2/archive/0.6.5.tar.gz
 	sha256sums = 9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a
 
-pkgname = ros-melodic-tf2-tools
+pkgname = ros-noetic-tf2-tools
 
diff --git a/PKGBUILD b/PKGBUILD
index d5138e3c256b..bea0d493b280 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 pkgdesc="ROS - tf2_tools."
 url='https://www.wiki.ros.org/tf2_tools'
 
-pkgname='ros-melodic-tf2-tools'
+pkgname='ros-noetic-tf2-tools'
 pkgver='0.6.5'
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-tf2-msgs
-  ros-melodic-tf2
-  ros-melodic-catkin
-  ros-melodic-tf2-ros)
+ros_makedepends=(ros-noetic-tf2-msgs
+  ros-noetic-tf2
+  ros-noetic-catkin
+  ros-noetic-tf2-ros)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-tf2-msgs
-  ros-melodic-tf2
-  ros-melodic-tf2-ros)
+ros_depends=(ros-noetic-tf2-msgs
+  ros-noetic-tf2
+  ros-noetic-tf2-ros)
 depends=(${ros_depends[@]})
 
 _dir="geometry2-${pkgver}/tf2_tools"
@@ -26,21 +26,17 @@ sha256sums=('9a1268621518fc22afd7b12ef1cf30e6901a57b054535924d1d74fd5d267773a')
 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
 }