summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD4
1 files changed, 3 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 4cf8aa81a7ff..d6b615e72c53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=('python-wstool')
pkgname=('python-wstool' 'python2-wstool')
_module='wstool'
pkgver='0.1.13'
-pkgrel=1
+pkgrel=2
pkgdesc="workspace multi-SCM commands"
url="http://wiki.ros.org/wstool"
depends=()
@@ -28,12 +28,14 @@ build() {
package_python-wstool() {
depends+=('python' 'python-vcstools' 'python-yaml')
+ conflicts=('python2-wstool')
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
package_python2-wstool() {
depends+=('python2' 'python2-vcstools' 'python2-yaml')
+ conflicts=('python-wstool')
cd "${srcdir}/${_module}-${pkgver}-python2"
python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}