diff options
author | Kartik Mohta | 2017-06-08 19:43:57 -0400 |
---|---|---|
committer | Kartik Mohta | 2017-06-08 19:43:57 -0400 |
commit | fb2b122d06c349c7ef8a0f0203b182a162849310 (patch) | |
tree | cca99e02082f9a7948bd690a92e89843f4681c5a | |
parent | 576a7991e1b90088f3783f4458964f497d8a16d9 (diff) | |
download | aur-fb2b122d06c349c7ef8a0f0203b182a162849310.tar.gz |
Add conflicts between the python 2 & 3 versions
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -15,6 +15,7 @@ pkgname = python-catkin_lint depends = python depends = python-catkin_pkg conflicts = python-catkin-lint + conflicts = python2-catkin_lint replaces = python-catkin-lint pkgname = python2-catkin_lint @@ -22,5 +23,6 @@ pkgname = python2-catkin_lint depends = python2 depends = python2-catkin_pkg conflicts = python2-catkin-lint + conflicts = python-catkin_lint replaces = python2-catkin-lint @@ -28,7 +28,7 @@ build() { package_python-catkin_lint() { depends+=('python' 'python-catkin_pkg') - conflicts=('python-catkin-lint') + conflicts=('python-catkin-lint' 'python2-catkin_lint') replaces=('python-catkin-lint') cd "${srcdir}/${_module}-${pkgver}" python setup.py install --root="${pkgdir}" --optimize=1 --skip-build @@ -36,7 +36,7 @@ package_python-catkin_lint() { package_python2-catkin_lint() { depends+=('python2' 'python2-catkin_pkg') - conflicts=('python2-catkin-lint') + conflicts=('python2-catkin-lint' 'python-catkin_lint') replaces=('python2-catkin-lint') cd "${srcdir}/${_module}-${pkgver}-python2" python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build |