Update to 1.9.24 and noetic

2 files changed, 22 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d9b9d732acf..17b637f7565d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
-pkgbase = ros-melodic-roslisp
+pkgbase = ros-noetic-roslisp
 	pkgdesc = ROS - Lisp client library for ROS, the Robot Operating System.
-	pkgver = 1.9.22
-	pkgrel = 2
+	pkgver = 1.9.24
+	pkgrel = 1
 	url = https://wiki.ros.org/roslisp
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-rosgraph-msgs
-	depends = ros-melodic-roslang
-	depends = ros-melodic-std-srvs
-	depends = ros-melodic-rospack
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-rosgraph-msgs
+	depends = ros-noetic-roslang
+	depends = ros-noetic-std-srvs
+	depends = ros-noetic-rospack
 	depends = sbcl
-	source = ros-melodic-roslisp-1.9.22.tar.gz::https://github.com/ros/roslisp/archive/1.9.22.tar.gz
-	sha256sums = 23164ff090ba09d6ad67ad34bdf3c24662d0fdb59a81af8a69ab2827793a77e4
+	source = ros-noetic-roslisp-1.9.24.tar.gz::https://github.com/ros/roslisp/archive/1.9.24.tar.gz
+	sha256sums = 5b6fdbf3047172f542ac00e45f26c708766fb724bc5b270e236341f7b555d45d
 
-pkgname = ros-melodic-roslisp
+pkgname = ros-noetic-roslisp
 
diff --git a/PKGBUILD b/PKGBUILD
index 63f85fc16e4a..7b70eca2353c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgdesc="ROS - Lisp client library for ROS, the Robot Operating System."
 url='https://wiki.ros.org/roslisp'
 
-pkgname='ros-melodic-roslisp'
-pkgver='1.9.22'
+pkgname='ros-noetic-roslisp'
+pkgver='1.9.24'
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-catkin
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -20,10 +20,10 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-rosgraph-msgs
-	ros-melodic-roslang
-	ros-melodic-std-srvs
-	ros-melodic-rospack
+	ros-noetic-rosgraph-msgs
+	ros-noetic-roslang
+	ros-noetic-std-srvs
+	ros-noetic-rospack
 )
 
 depends=(
@@ -33,29 +33,23 @@ depends=(
 
 _dir="roslisp-${pkgver}"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/roslisp/archive/${pkgver}.tar.gz")
-sha256sums=('23164ff090ba09d6ad67ad34bdf3c24662d0fdb59a81af8a69ab2827793a77e4')
+sha256sums=('5b6fdbf3047172f542ac00e45f26c708766fb724bc5b270e236341f7b555d45d')
 
 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
 }