Update to version 0.4.0-1

1 files changed, 5 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8147a2198b9b..39e4df7e23f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@ ros_makedepends=()
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-ardent-std-msgs
-  ros-ardent-ros2run
+ros_depends=(ros-ardent-launch
+  ros-ardent-std-msgs
   ros-ardent-rclpy
-  ros-ardent-launch)
+  ros-ardent-ros2run)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
@@ -31,33 +31,7 @@ _dir="demos-release-release-ardent-topic_monitor-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/demos-release/archive/release/ardent/topic_monitor/${pkgver}-${_pkgver_patch}.tar.gz")
 sha256sums=('c4dbf536534a409254a744c0b7403c96712c8e5038039432b31a58138bac6172')
 
-build() {
-  # Use ROS environment variables
-  source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/ardent/setup.bash ] && source /opt/ros/ardent/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/ardent \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
-        -DPYTHON_BASENAME=.cpython-35m \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF \
-        -DCATKIN_ENABLE_TESTING=OFF
-  make
-}
-
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/${_dir}"
+  python setup.py install --root="$pkgdir" --prefix="/opt/ros/ardent" --optimize=1
 }