summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Schlisio2016-07-04 17:55:39 +0200
committerGeorg Schlisio2016-07-04 17:55:39 +0200
commitdeb1819b300e8677b780547d081acf35ebd94645 (patch)
treecc2414ccaf2e1e09f4838c5d70b28097006d17ee
parent850b395ffbda72401e54cd5ae36f94d6fc1d5a21 (diff)
downloadaur-deb1819b300e8677b780547d081acf35ebd94645.tar.gz
mark as mutually conflicting, add note in PKGBUILD about possible resolution
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD19
2 files changed, 21 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 39584472557..f8344f9c7b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = python-dill
pkgdesc = Serialize all of python (almost)
pkgver = 0.2.5
- pkgrel = 1
+ pkgrel = 2
url = http://pypi.python.org/pypi/dill/
arch = any
license = BSD
@@ -10,7 +10,9 @@ pkgbase = python-dill
pkgname = python-dill
depends = python
+ conflicts = python2-dill
pkgname = python2-dill
depends = python2
+ conflicts = python-dill
diff --git a/PKGBUILD b/PKGBUILD
index d6b1491d470..5777ce240b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,19 @@
# former Maintainer python-dill: Antony Lee
# former Maintainer python2-dill: bchretien
+# Please note: These 2 packages conflict, since both
+# aim to install /usr/bin/{get_objgraph,unpickle}.py.
+# This is not generically resolvable, these packages
+# are thus marked as mutually conflicting.
+# If you need to install both, you have to choose which
+# package is to provide said programs (difference in
+# shebang only!). To do that edit the last lines of each
+# package function accordingly.
+
pkgname=("python-dill" "python2-dill")
pkgbase=python-dill
pkgver=0.2.5
-pkgrel=1
+pkgrel=2
pkgdesc='Serialize all of python (almost)'
arch=('any')
url='http://pypi.python.org/pypi/dill/'
@@ -22,6 +31,10 @@ package_python-dill() {
cd "$srcdir/dill-$pkgver"
python setup.py install --root="$pkgdir/" --optimize=1
install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # edit to resolve conflict
+ conflicts=('python2-dill')
+ #rm "$pkgdir/usr/bin/get_objgraph.py" "$pkgdir/usr/bin/unpickle.py"
}
package_python2-dill() {
@@ -30,4 +43,8 @@ package_python2-dill() {
find . -name "*.py" -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} \;
python2 setup.py install --root="$pkgdir/" --optimize=1
install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # edit to resolve conflict
+ conflicts=('python-dill')
+ #rm "$pkgdir/usr/bin/get_objgraph.py" "$pkgdir/usr/bin/unpickle.py"
}