noetic release

1 files changed, 28 insertions, 36 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1499c2487083..f81474c1d684 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,53 @@
-# Script generated with create_pkgbuild.py
-# For more information: https://github.com/ros-melodic-arch/ros-build-tools-py3
 pkgdesc="ROS - panda Resources used for MoveIt! testing."
-url='h'
+url='https://wiki.ros.org/moveit_resources'
 
-pkgname='ros-melodic-moveit-resources-panda-description'
-pkgver='0.7.0'
+pkgname='ros-noetic-moveit-resources-panda-description'
+pkgver='0.7.1'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-  ros-melodic-catkin
+    ros-noetic-catkin
 )
 
 makedepends=(
-  'cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
+    cmake
+    ros-build-tools
+    ${ros_makedepends[@]}
 )
 
 ros_depends=(
 )
 
 depends=(
-  ${ros_depends[@]}
+    ${ros_depends[@]}
 )
 
-_dir="moveit_resources-release-release-melodic-moveit_resources_panda_description"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_panda_description/${pkgver}.tar.gz")
-sha256sums=('302af814b6077db1cd63914e532410b9f0bf2dd717e0794a59abce80f6e436bd')
+_dir="moveit_resources-${pkgver}/panda_description"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/moveit_resources/archive/${pkgver}.tar.gz")
+sha256sums=('1b6364d808fbfa01bbc302fc66821ef0bd564b67be0e2ab9e394c5931ac3dc07')
 
 
 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
-
-  # 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.8 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.8.so \
-    -DPYTHON_BASENAME=.cpython-38 \
-    -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
+    # Use ROS environment variables
+    source /usr/share/ros-build-tools/clear-ros-env.sh
+    [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
+
+    # Create build directory
+    [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+    cd ${srcdir}/build
+
+    # Build project
+    cmake ${srcdir}/${_dir} \
+      -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+      -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+      -DPYTHON_EXECUTABLE=/usr/bin/python \
+      -DSETUPTOOLS_DEB_LAYOUT=OFF
+    make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+    cd "${srcdir}/build"
+    make DESTDIR="${pkgdir}/" install
 }