Merge pull request #2 from acxz/master

upgrade to 2.5.4 and py3.8

2 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ed9319c662f..6c59023ef9f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ros-melodic-rospack
 	pkgdesc = ROS - ROS Package Tool.
-	pkgver = 2.5.3
+	pkgver = 2.5.4
 	pkgrel = 1
 	url = https://wiki.ros.org/rospack
 	arch = any
@@ -21,8 +21,8 @@ pkgbase = ros-melodic-rospack
 	depends = pkg-config
 	depends = boost
 	depends = python
-	source = ros-melodic-rospack-2.5.3.tar.gz::https://github.com/ros/rospack/archive/2.5.3.tar.gz
-	sha256sums = 6d3def4e56d351baab049550b41d4b452da3fa262ba1e2fdc8ec8173ebe0eebd
+	source = ros-melodic-rospack-2.5.4.tar.gz::https://github.com/ros/rospack/archive/2.5.4.tar.gz
+	sha256sums = f28c9399bb45818a60d2e348ad5a5a43a87aea4a362ebaea63230fd9120e19af
 
 pkgname = ros-melodic-rospack
 
diff --git a/PKGBUILD b/PKGBUILD
index 1183065a2a37..ced63e6c7017 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - ROS Package Tool."
 url='https://wiki.ros.org/rospack'
 
 pkgname='ros-melodic-rospack'
-pkgver='2.5.3'
+pkgver='2.5.4'
 arch=('any')
 pkgrel=1
 license=('BSD')
@@ -41,7 +41,7 @@ depends=(
 
 _dir="rospack-${pkgver}"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/rospack/archive/${pkgver}.tar.gz")
-sha256sums=('6d3def4e56d351baab049550b41d4b452da3fa262ba1e2fdc8ec8173ebe0eebd')
+sha256sums=('f28c9399bb45818a60d2e348ad5a5a43a87aea4a362ebaea63230fd9120e19af')
 
 build() {
 	# Use ROS environment variables.
@@ -61,9 +61,9 @@ build() {
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
 		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
+		-DPYTHON_INCLUDE_DIR=/usr/include/python3.8 \
+		-DPYTHON_LIBRARY=/usr/lib/libpython3.8.so \
+		-DPYTHON_BASENAME=.cpython-38 \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }