Update to 0.6.15 and noetic

2 files changed, 14 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3dd51bbdb68..3a3a5a30d759 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
-pkgbase = ros-melodic-genmsg
+pkgbase = ros-noetic-genmsg
 	pkgdesc = ROS - Standalone Python library for generating ROS message and service data structures for various languages.
-	pkgver = 0.5.12
+	pkgver = 0.5.16
 	pkgrel = 1
 	url = https://www.wiki.ros.org/genmsg
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-catkin
-	source = ros-melodic-genmsg-0.5.12.tar.gz::https://github.com/ros/genmsg/archive/0.5.12.tar.gz
-	sha256sums = 0e29bde730b4e114d1050998e833681fa3917f530cfab674e71fa21677d2a7ae
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-catkin
+	source = ros-noetic-genmsg-0.5.16.tar.gz::https://github.com/ros/genmsg/archive/0.5.16.tar.gz
+	sha256sums = 0e414846823a2aaa7781f81268251c7c9a45ff96cef8e6a78bbbbcf7e4c28d56
 
-pkgname = ros-melodic-genmsg
+pkgname = ros-noetic-genmsg
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d27f5ecdf5a..b783a81b539b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgdesc="ROS - Standalone Python library for generating ROS message and service data structures for various languages."
 url='https://www.wiki.ros.org/genmsg'
 
-pkgname='ros-melodic-genmsg'
-pkgver='0.5.12'
+pkgname='ros-noetic-genmsg'
+pkgver='0.5.16'
 arch=('any')
 pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -20,7 +20,7 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 depends=(
@@ -29,29 +29,23 @@ depends=(
 
 _dir="genmsg-${pkgver}"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/genmsg/archive/${pkgver}.tar.gz")
-sha256sums=('0e29bde730b4e114d1050998e833681fa3917f530cfab674e71fa21677d2a7ae')
+sha256sums=('0e414846823a2aaa7781f81268251c7c9a45ff96cef8e6a78bbbbcf7e4c28d56')
 
 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 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }