Update to 0.5.4 and noetic

2 files changed, 16 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce25df73122b..2e09f0b0c62a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
-pkgbase = ros-melodic-rosconsole-bridge
+pkgbase = ros-noetic-rosconsole-bridge
 	pkgdesc = ROS - rosconsole_bridge is a package used in conjunction with console_bridge and rosconsole for connecting console_bridge-based logging to rosconsole-based logging.
-	pkgver = 0.5.3
+	pkgver = 0.5.4
 	pkgrel = 1
 	url = https://www.wiki.ros.org/rosconsole_bridge
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-catkin
 	makedepends = console-bridge
-	depends = ros-melodic-rosconsole
+	depends = ros-noetic-rosconsole
 	depends = console-bridge
-	source = ros-melodic-rosconsole-bridge-0.5.3.tar.gz::https://github.com/ros/rosconsole_bridge/archive/0.5.3.tar.gz
-	sha256sums = e2aca7171b599a65c630e0be199cc642f7bfde266f58a34501def4644ec52fb1
+	source = ros-noetic-rosconsole-bridge-0.5.4.tar.gz::https://github.com/ros/rosconsole_bridge/archive/0.5.4.tar.gz
+	sha256sums = d74931186eff823a2cf5af7122c6ed88e4c2bc5286055816517e6310d24a0730
 
-pkgname = ros-melodic-rosconsole-bridge
+pkgname = ros-noetic-rosconsole-bridge
 
diff --git a/PKGBUILD b/PKGBUILD
index f1e0f3dbe7a5..958eac727062 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 pkgdesc="ROS - rosconsole_bridge is a package used in conjunction with console_bridge and rosconsole for connecting console_bridge-based logging to rosconsole-based logging."
 url='https://www.wiki.ros.org/rosconsole_bridge'
 
-pkgname='ros-melodic-rosconsole-bridge'
-pkgver='0.5.3'
+pkgname='ros-noetic-rosconsole-bridge'
+pkgver='0.5.4'
 arch=('any')
 pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-rosconsole
-	ros-melodic-catkin
+	ros-noetic-rosconsole
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -22,7 +22,7 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rosconsole
+	ros-noetic-rosconsole
 )
 
 depends=(
@@ -32,29 +32,23 @@ depends=(
 
 _dir="rosconsole_bridge-${pkgver}"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/rosconsole_bridge/archive/${pkgver}.tar.gz")
-sha256sums=('e2aca7171b599a65c630e0be199cc642f7bfde266f58a34501def4644ec52fb1')
+sha256sums=('d74931186eff823a2cf5af7122c6ed88e4c2bc5286055816517e6310d24a0730')
 
 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
 }