summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorG. Schlisio2016-11-19 22:54:55 +0100
committerG. Schlisio2016-11-19 22:54:55 +0100
commit95265054116f2ea88a6faa72b0447ac62aca3323 (patch)
tree76aeefc039500a3507d982a6f1bac079617f05e7
parentdeb1819b300e8677b780547d081acf35ebd94645 (diff)
downloadaur-95265054116f2ea88a6faa72b0447ac62aca3323.tar.gz
resolving conflict by renaming python2-executables
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD26
-rw-r--r--python2-dill.install9
3 files changed, 20 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8344f9c7b1..7d2217d1f11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
pkgbase = python-dill
pkgdesc = Serialize all of python (almost)
pkgver = 0.2.5
- pkgrel = 2
+ pkgrel = 3
url = http://pypi.python.org/pypi/dill/
arch = any
license = BSD
source = http://pypi.python.org/packages/source/d/dill/dill-0.2.5.tgz
+ source = python2-dill.install
md5sums = 5b0c312f034914be2e230457747d9b6c
+ md5sums = 03858fb53bf5ae72e3f39f4346c9e40f
pkgname = python-dill
depends = python
- conflicts = python2-dill
pkgname = python2-dill
+ install = python2-dill.install
depends = python2
- conflicts = python-dill
diff --git a/PKGBUILD b/PKGBUILD
index 5777ce240b1..1328f471f76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,17 @@
# 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=2
+pkgrel=3
pkgdesc='Serialize all of python (almost)'
arch=('any')
url='http://pypi.python.org/pypi/dill/'
license=('BSD')
-source=("http://pypi.python.org/packages/source/d/dill/dill-$pkgver.tgz")
-md5sums=('5b0c312f034914be2e230457747d9b6c')
+source=("http://pypi.python.org/packages/source/d/dill/dill-$pkgver.tgz" "python2-dill.install")
+md5sums=('5b0c312f034914be2e230457747d9b6c'
+ '03858fb53bf5ae72e3f39f4346c9e40f')
build() {
cd "$srcdir/dill-$pkgver"
@@ -31,20 +23,16 @@ 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() {
depends=('python2')
+ install=python2-dill.install
cd "$srcdir/dill-$pkgver"
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"
+ mv "$pkgdir/usr/bin/get_objgraph.py" "$pkgdir/usr/bin/get_objgraph2.py"
+ mv "$pkgdir/usr/bin/unpickle.py" "$pkgdir/usr/bin/unpickle2.py"
}
diff --git a/python2-dill.install b/python2-dill.install
new file mode 100644
index 00000000000..804af234bcb
--- /dev/null
+++ b/python2-dill.install
@@ -0,0 +1,9 @@
+post_install(){
+ cat << \here
+Accompanying programs unpickle.py and get_objgraph.py are available as unpickle2.py and get_objgraph2.py
+here
+}
+
+post_upgrade(){
+ post_install
+}