summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-08 19:37:41 -0400
committerKartik Mohta2017-06-08 19:37:41 -0400
commit797af1e3b914132026b2eccdb8802bedc9747b04 (patch)
treecaba909b1e546503a71bcaf90d79dfaf800d709f
parent3610fb01fbeb042d65b020505b81bd050f4e9e20 (diff)
downloadaur-797af1e3b914132026b2eccdb8802bedc9747b04.tar.gz
Add conflicts between the python 2 & 3 versions
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 91b37275b80..2cbfbe6674c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,7 @@ pkgname = python-catkin_pkg
depends = python-dateutil
depends = python-docutils
conflicts = python-catkin-pkg
+ conflicts = python2-catkin_pkg
replaces = python-catkin-pkg
pkgname = python2-catkin_pkg
@@ -26,5 +27,6 @@ pkgname = python2-catkin_pkg
depends = python2-dateutil
depends = python2-docutils
conflicts = python2-catkin-pkg
+ conflicts = python-catkin_pkg
replaces = python2-catkin-pkg
diff --git a/PKGBUILD b/PKGBUILD
index 96ff2773b58..2e61e568f89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ build() {
package_python-catkin_pkg() {
depends+=('python' 'python-argparse' 'python-dateutil' 'python-docutils')
- conflicts=('python-catkin-pkg')
+ conflicts=('python-catkin-pkg' 'python2-catkin_pkg')
replaces=('python-catkin-pkg')
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
@@ -36,7 +36,7 @@ package_python-catkin_pkg() {
package_python2-catkin_pkg() {
depends+=('python2' 'python2-argparse' 'python2-dateutil' 'python2-docutils')
- conflicts=('python2-catkin-pkg')
+ conflicts=('python2-catkin-pkg' 'python-catkin_pkg')
replaces=('python2-catkin-pkg')
cd "${srcdir}/${_module}-${pkgver}-python2"
python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build