Update to version 1.0.0-6

2 files changed, 8 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5690f282110..0303e778bc31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:46:14 UTC 2017
+# Thu Dec 21 22:29:51 UTC 2017
 pkgbase = ros-ardent-urdfdom-headers
 	pkgdesc = ROS - C++ headers for URDF.
 	pkgver = 1.0.0
@@ -10,8 +10,8 @@ pkgbase = ros-ardent-urdfdom-headers
 	makedepends = cmake
 	makedepends = ros-build-tools
 	depends = ros-ardent-console-bridge
-	depends = boost
 	depends = tinyxml
+	depends = boost
 	source = ros-ardent-urdfdom-headers-1.0.0-5.tar.gz::https://github.com/ros2-gbp/urdfdom_headers-release/archive/release/ardent/urdfdom_headers/1.0.0-5.tar.gz
 	sha256sums = ae7e78c8008afb9ee157e99ec9c137508a552031be8fc939f156188b504e7e95
 
diff --git a/PKGBUILD b/PKGBUILD
index 48c439a0c81f..0634b6991139 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ makedepends=('cmake' 'ros-build-tools'
 
 ros_depends=(ros-ardent-console-bridge)
 depends=(${ros_depends[@]}
-  boost
-  tinyxml)
+  tinyxml
+  boost)
 
 # Git version (e.g. for debugging)
 # _tag=release/ardent/urdfdom_headers/${pkgver}-${_pkgver_patch}
@@ -42,17 +42,13 @@ build() {
   # Fix Python2/Python3 conflicts
   /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
 
+  export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages
+
   # 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
+        -DBUILD_TESTING=Off \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent
   make
 }