Update to 1.15.4 and noetic

2 files changed, 22 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7379fef89e07..b563b2c0fae5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
-pkgbase = ros-melodic-rosservice
+pkgbase = ros-noetic-rosservice
 	pkgdesc = ROS - rosservice contains the rosservice command-line tool for listing and querying ROS Services.
-	pkgver = 1.14.3
+	pkgver = 1.15.4
 	pkgrel = 1
 	url = https://wiki.ros.org/rosservice
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-genpy
-	depends = ros-melodic-rosmsg
-	depends = ros-melodic-rosgraph
-	depends = ros-melodic-rospy
-	depends = ros-melodic-roslib
-	source = ros-melodic-rosservice-1.14.3.tar.gz::https://github.com/ros/ros_comm/archive/1.14.3.tar.gz
-	sha256sums = 3e49bef96b8a0f9684e5c4f1736d171e9c8842a3979d5d3c6442b53698e8167f
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-genpy
+	depends = ros-noetic-rosmsg
+	depends = ros-noetic-rosgraph
+	depends = ros-noetic-rospy
+	depends = ros-noetic-roslib
+	source = ros-noetic-rosservice-1.15.4.tar.gz::https://github.com/ros/ros_comm/archive/1.15.4.tar.gz
+	sha256sums = d5c96a81e0c8554b77666bca5dcc68e03083a761a117038ff9b65f9643751c9e
 
-pkgname = ros-melodic-rosservice
+pkgname = ros-noetic-rosservice
 
diff --git a/PKGBUILD b/PKGBUILD
index 360b976ad333..c2fd5e2f30e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgdesc="ROS - rosservice contains the rosservice command-line tool for listing and querying ROS Services."
 url='https://wiki.ros.org/rosservice'
 
-pkgname='ros-melodic-rosservice'
-pkgver='1.14.3'
+pkgname='ros-noetic-rosservice'
+pkgver='1.15.4'
 arch=('any')
 pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -20,11 +20,11 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-genpy
-	ros-melodic-rosmsg
-	ros-melodic-rosgraph
-	ros-melodic-rospy
-	ros-melodic-roslib
+	ros-noetic-genpy
+	ros-noetic-rosmsg
+	ros-noetic-rosgraph
+	ros-noetic-rospy
+	ros-noetic-roslib
 )
 
 depends=(
@@ -33,29 +33,23 @@ depends=(
 
 _dir="ros_comm-${pkgver}/tools/rosservice"
 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 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }