upd to noetic, cmake vars, python

2 files changed, 10 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0065e51ee5a0..eff6495db7ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-convex-decomposition
+pkgbase = ros-noetic-convex-decomposition
 	pkgdesc = ROS - Convex Decomposition Tool for Robot Model.
 	pkgver = 0.1.12
 	pkgrel = 2
@@ -7,11 +7,11 @@ pkgbase = ros-melodic-convex-decomposition
 	license = MIT
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-catkin
 	makedepends = unzip
 	depends = unzip
-	source = ros-melodic-convex-decomposition-0.1.12.tar.gz::https://github.com/ros/convex_decomposition/archive/0.1.12.tar.gz
+	source = ros-noetic-convex-decomposition-0.1.12.tar.gz::https://github.com/ros/convex_decomposition/archive/0.1.12.tar.gz
 	sha256sums = 01621bace11c1929a2ae252a37763fbe7f56d0cfb651105e992505b96d9fdd4a
 
-pkgname = ros-melodic-convex-decomposition
+pkgname = ros-noetic-convex-decomposition
 
diff --git a/PKGBUILD b/PKGBUILD
index ebc0be56d29e..b3ddcfcd59f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 pkgdesc="ROS - Convex Decomposition Tool for Robot Model."
 url='https://codesuppository.blogspot.com'
 
-pkgname='ros-melodic-convex-decomposition'
+pkgname='ros-noetic-convex-decomposition'
 pkgver='0.1.12'
 arch=('any')
 pkgrel=2
 license=('MIT')
 
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   unzip)
@@ -18,7 +18,7 @@ depends=(${ros_depends[@]}
   unzip)
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/convex_decomposition/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/convex_decomposition/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/convex_decomposition-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -31,24 +31,17 @@ sha256sums=('01621bace11c1929a2ae252a37763fbe7f56d0cfb651105e992505b96d9fdd4a')
 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 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 project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -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=-python3.7m \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }