summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbionade242019-05-20 16:16:02 +0000
committerbionade242019-06-18 21:37:01 +0000
commitaffe5ece1a0ad18aaf8c4e0d6d06c5bc4f10f6b3 (patch)
treeaed954f9c13bcb3b651ba909ec3a180943b6a197
parent1f3a466bcec298295cd799a23eefc1c1d3778be4 (diff)
downloadaur-affe5ece1a0ad18aaf8c4e0d6d06c5bc4f10f6b3.tar.gz
Switched to ros-build-tools with py3 support
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fdb1266904b1..3c8236fe736c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
pkgbase = ros-melodic-catkin
pkgdesc = ROS - Low-level build system macros and infrastructure for ROS.
pkgver = 0.7.17
- pkgrel = 1
+ pkgrel = 2
url = http://www.ros.org/wiki/catkin
arch = any
license = BSD
makedepends = cmake
- makedepends = ros-build-tools
makedepends = python-catkin_pkg
makedepends = python-empy
makedepends = python
@@ -16,7 +15,8 @@ pkgbase = ros-melodic-catkin
depends = python-empy
depends = gmock
depends = python
- source = ros-melodic-catkin-0.7.17-0.tar.gz::https://github.com/ros/catkin/archive/0.7.17.tar.gz
+ depends = ros-build-tools-py3
+ source = ros-melodic-catkin-0.7.17.tar.gz::https://github.com/ros/catkin/archive/0.7.17.tar.gz
sha256sums = 71a735bee28e4132350fae55c14324ff7cb7c6d0548ee08e5f6d588985001541
pkgname = ros-melodic-catkin
diff --git a/PKGBUILD b/PKGBUILD
index ba1b05b89d58..532f25dd8bcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,8 @@ url='http://www.ros.org/wiki/catkin'
pkgname='ros-melodic-catkin'
pkgver='0.7.17'
-_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(
@@ -15,7 +14,6 @@ ros_makedepends=(
makedepends=(
'cmake'
- 'ros-build-tools'
${ros_makedepends[@]}
python-catkin_pkg
python-empy
@@ -33,10 +31,11 @@ depends=(
python-empy
gmock
python
+ ros-build-tools-py3
)
_dir="catkin-${pkgver}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros/catkin/archive/${pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/catkin/archive/${pkgver}.tar.gz")
sha256sums=('71a735bee28e4132350fae55c14324ff7cb7c6d0548ee08e5f6d588985001541')
build() {