summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-18 15:06:49 -0400
committerKartik Mohta2017-06-18 15:06:49 -0400
commitf9140cc53a2fc5148588e9a214f01b51fbcc31c0 (patch)
treee599aa148758822b502d0d92cce2c081a5fc2011
parentace498b2b4bbb35e1353d9d140c89428869f681e (diff)
downloadaur-f9140cc53a2fc5148588e9a214f01b51fbcc31c0.tar.gz
Add conflicts between the Python 2 & 3 packages
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a099401b5a4..5f60c3f8298c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Jun 1 00:21:28 UTC 2017
pkgbase = python-wstool
pkgdesc = workspace multi-SCM commands
pkgver = 0.1.13
- pkgrel = 1
+ pkgrel = 2
url = http://wiki.ros.org/wstool
arch = any
license = BSD
@@ -17,10 +15,12 @@ pkgname = python-wstool
depends = python
depends = python-vcstools
depends = python-yaml
+ conflicts = python2-wstool
pkgname = python2-wstool
depends =
depends = python2
depends = python2-vcstools
depends = python2-yaml
+ conflicts = python-wstool
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
}