noetic release

2 files changed, 47 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0c6da808204..dee62aa85826 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-pkgbase = ros-melodic-moveit-resources-panda-moveit-config
+pkgbase = ros-noetic-moveit-resources-panda-moveit-config
 	pkgdesc = ROS - MoveIt Resources for testing: Franka Emika Panda A project-internal configuration for testing in MoveIt.
-	pkgver = 0.7.0
+	pkgver = 0.7.1
 	pkgrel = 1
-	url = h
+	url = https://wiki.ros.org/moveit_resources
 	arch = i686
 	arch = x86_64
 	arch = aarch64
@@ -11,15 +11,15 @@ pkgbase = ros-melodic-moveit-resources-panda-moveit-config
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-xacro
-	depends = ros-melodic-robot-state-publisher
-	depends = ros-melodic-moveit-resources-panda-description
-	depends = ros-melodic-joint-state-publisher
-	depends = ros-melodic-joint-state-publisher-gui
-	depends = ros-melodic-topic-tools
-	source = ros-melodic-moveit-resources-panda-moveit-config-0.7.0.tar.gz::https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_panda_moveit_config/0.7.0.tar.gz
-	sha256sums = 8ddc0aee83159b05be65c6b0409c95326808a461b7a4fa9e117d06eb68707d94
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-xacro
+	depends = ros-noetic-robot-state-publisher
+	depends = ros-noetic-moveit-resources-panda-description
+	depends = ros-noetic-joint-state-publisher
+	depends = ros-noetic-joint-state-publisher-gui
+	depends = ros-noetic-topic-tools
+	source = ros-noetic-moveit-resources-panda-moveit-config-0.7.1.tar.gz::https://github.com/ros-planning/moveit_resources/archive/0.7.1.tar.gz
+	sha256sums = 1b6364d808fbfa01bbc302fc66821ef0bd564b67be0e2ab9e394c5931ac3dc07
 
-pkgname = ros-melodic-moveit-resources-panda-moveit-config
+pkgname = ros-noetic-moveit-resources-panda-moveit-config
 
diff --git a/PKGBUILD b/PKGBUILD
index 021a54f9abff..649bf5a1a9d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,59 @@
-# Script generated with create_pkgbuild.py
-# For more information: https://github.com/ros-melodic-arch/ros-build-tools-py3
 pkgdesc="ROS -  MoveIt Resources for testing: Franka Emika Panda A project-internal configuration for testing in MoveIt."
-url='h'
+url='https://wiki.ros.org/moveit_resources'
 
-pkgname='ros-melodic-moveit-resources-panda-moveit-config'
-pkgver='0.7.0'
+pkgname='ros-noetic-moveit-resources-panda-moveit-config'
+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=(
-  ros-melodic-xacro
-  ros-melodic-robot-state-publisher
-  ros-melodic-moveit-resources-panda-description
-  ros-melodic-joint-state-publisher
-  ros-melodic-joint-state-publisher-gui
-  ros-melodic-topic-tools
+    ros-noetic-xacro
+    ros-noetic-robot-state-publisher
+    ros-noetic-moveit-resources-panda-description
+    ros-noetic-joint-state-publisher
+    ros-noetic-joint-state-publisher-gui
+    ros-noetic-topic-tools
 )
 
 depends=(
-  ${ros_depends[@]}
+    ${ros_depends[@]}
 )
 
-_dir="moveit_resources-release-release-melodic-moveit_resources_panda_moveit_config"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_panda_moveit_config/${pkgver}.tar.gz")
-sha256sums=('8ddc0aee83159b05be65c6b0409c95326808a461b7a4fa9e117d06eb68707d94')
+_dir="moveit_resources-${pkgver}/panda_moveit_config"
+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
 }