Update to version 0.4.0-1

2 files changed, 3 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7e7d50609a0..8fbea2a7d174 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:44:03 UTC 2017
+# Thu Dec 21 22:29:48 UTC 2017
 pkgbase = ros-ardent-ros2pkg
 	pkgdesc = ROS - The pkg command for ROS 2 command line tools.
 	pkgver = 0.4.0
diff --git a/PKGBUILD b/PKGBUILD
index b6f8b845e847..651b7c4900bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,33 +29,7 @@ _dir="ros2cli-release-release-ardent-ros2pkg-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/ros2cli-release/archive/release/ardent/ros2pkg/${pkgver}-${_pkgver_patch}.tar.gz")
 sha256sums=('e001b5d704cd5e224834d8992af3af77da89c39df0096f5e3ee479f7036ddba8')
 
-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
 }