summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-03 16:59:45 -0400
committerKartik Mohta2017-06-03 16:59:45 -0400
commit3610fb01fbeb042d65b020505b81bd050f4e9e20 (patch)
treed1e90fa31ac90b46a63f377b428d6f4b08c6c406
parent7467d5aa378a9a254af8594966ea41e1a59c90f1 (diff)
downloadaur-3610fb01fbeb042d65b020505b81bd050f4e9e20.tar.gz
Add conflicts and replaces for python-catkin-pkg & python2-catkin-pkg
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 8 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d34f01fe6d..91b37275b80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Thu Jun 1 00:21:22 UTC 2017
pkgbase = python-catkin_pkg
pkgdesc = catkin package library
pkgver = 0.3.4
@@ -18,6 +16,8 @@ pkgname = python-catkin_pkg
depends = python-argparse
depends = python-dateutil
depends = python-docutils
+ conflicts = python-catkin-pkg
+ replaces = python-catkin-pkg
pkgname = python2-catkin_pkg
depends =
@@ -25,4 +25,6 @@ pkgname = python2-catkin_pkg
depends = python2-argparse
depends = python2-dateutil
depends = python2-docutils
+ conflicts = python2-catkin-pkg
+ replaces = python2-catkin-pkg
diff --git a/PKGBUILD b/PKGBUILD
index 6341a03c037..96ff2773b58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,12 +28,16 @@ build() {
package_python-catkin_pkg() {
depends+=('python' 'python-argparse' 'python-dateutil' 'python-docutils')
+ conflicts=('python-catkin-pkg')
+ replaces=('python-catkin-pkg')
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
package_python2-catkin_pkg() {
depends+=('python2' 'python2-argparse' 'python2-dateutil' 'python2-docutils')
+ conflicts=('python2-catkin-pkg')
+ replaces=('python2-catkin-pkg')
cd "${srcdir}/${_module}-${pkgver}-python2"
python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}