Update to version 0.1.4-1

2 files changed, 3 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1dc50587033b..952434858e98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:42:37 UTC 2017
+# Thu Dec 21 22:29:48 UTC 2017
 pkgbase = ros-ardent-osrf-pycommon
 	pkgdesc = ROS - Commonly needed Python modules, used by Python software developed at OSRF.
 	pkgver = 0.1.4
diff --git a/PKGBUILD b/PKGBUILD
index 6cd41f803894..5763d4f2eddd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,33 +28,7 @@ _dir="osrf_pycommon-release-release-ardent-osrf_pycommon-${pkgver}-${_pkgver_pat
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/osrf_pycommon-release/archive/release/ardent/osrf_pycommon/${pkgver}-${_pkgver_patch}.tar.gz")
 sha256sums=('c0ff531d4fc96cbbeceac25bf0578bdec3a3e43b71163caf96d4b53ae09f4f57')
 
-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
 }