Update to 1.15.4 and noetic

2 files changed, 26 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45fa6633fe3a..f2c44efd3776 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-rospy
+pkgbase = ros-noetic-rospy
 	pkgdesc = ROS - rospy is a pure Python client library for ROS.
-	pkgver = 1.14.3
-	pkgrel = 2
+	pkgver = 1.15.4
+	pkgrel = 1
 	url = https://wiki.ros.org/rospy
 	arch = i686
 	arch = x86_64
@@ -11,18 +11,18 @@ pkgbase = ros-melodic-rospy
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-genpy
-	depends = ros-melodic-rosgraph-msgs
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-rosgraph
-	depends = ros-melodic-roslib
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-genpy
+	depends = ros-noetic-rosgraph-msgs
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-rosgraph
+	depends = ros-noetic-roslib
 	depends = python-yaml
 	depends = python-rospkg
 	depends = python-numpy
-	source = ros-melodic-rospy-1.14.3.tar.gz::https://github.com/ros/ros_comm/archive/1.14.3.tar.gz
-	sha256sums = 3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f
+	source = ros-noetic-rospy-1.15.4.tar.gz::https://github.com/ros/ros_comm/archive/1.15.4.tar.gz
+	sha256sums = d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e
 
-pkgname = ros-melodic-rospy
+pkgname = ros-noetic-rospy
 
diff --git a/PKGBUILD b/PKGBUILD
index 210bd2101ed1..8338c40de9f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgdesc="ROS - rospy is a pure Python client library for ROS."
 url='https://wiki.ros.org/rospy'
 
-pkgname='ros-melodic-rospy'
-pkgver='1.14.3'
+pkgname='ros-noetic-rospy'
+pkgver='1.15.4'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -20,12 +20,12 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-genpy
-	ros-melodic-rosgraph-msgs
-	ros-melodic-std-msgs
-	ros-melodic-roscpp
-	ros-melodic-rosgraph
-	ros-melodic-roslib
+	ros-noetic-genpy
+	ros-noetic-rosgraph-msgs
+	ros-noetic-std-msgs
+	ros-noetic-roscpp
+	ros-noetic-rosgraph
+	ros-noetic-roslib
 )
 
 depends=(
@@ -37,25 +37,22 @@ depends=(
 
 _dir="ros_comm-${pkgver}/clients/rospy"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
-sha256sums=('3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f')
+sha256sums=('d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e')
 
 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 \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make