summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 86f56d38c6a..203feaefc8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,9 +13,11 @@ pkgbase = pyutil
pkgname = python2-pyutil
depends = python2-simplejson
depends = python2-zbase32
+ conflicts = python-pyutil
replaces = pyutil
pkgname = python-pyutil
depends = python-simplejson
depends = python-zbase32
+ conflicts = python2-pyutil
diff --git a/PKGBUILD b/PKGBUILD
index e231d417011..de963e0f664 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,14 +16,15 @@ sha256sums=('8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848')
package_python2-pyutil() {
depends=('python2-simplejson' 'python2-zbase32')
replaces=('pyutil')
+ conflicts=('python-pyutil')
cd "$srcdir/pyutil-$pkgver"
python2 setup.py install --root="$pkgdir" --prefix='/usr' --optimize=1
rm -r "$pkgdir/usr/pyutil"
-
}
package_python-pyutil() {
depends=('python-simplejson' 'python-zbase32')
+ conflicts=('python2-pyutil')
cd "$srcdir/pyutil-$pkgver"
python setup.py install --root="$pkgdir" --prefix='/usr' --optimize=1
rm -r "$pkgdir/usr/pyutil"