summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Shaw2016-05-29 17:36:24 +0200
committerSascha Shaw2016-05-29 17:36:24 +0200
commit7de54f7ee94b7855bf45a1958653892985b801cf (patch)
tree8bdfdf08ef0eda170d1c09d8db66cf1c54fde45c
parent396f9b7bddf8e5781f73190b0c30e05234169ffb (diff)
downloadaur-7de54f7ee94b7855bf45a1958653892985b801cf.tar.gz
python and python2 versions can now be installed at the same time
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD15
2 files changed, 14 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9dd272633e8..7d69afa0ef39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = python-odfpy-git
pkgdesc = tools and libraries for manipulating OpenDocument 1.2 files in Python
- pkgver = 1.3
+ pkgver = 1.3.3
pkgrel = 1
url = https://github.com/eea/odfpy
arch = any
@@ -9,14 +9,14 @@ pkgbase = python-odfpy-git
pkgname = python-odfpy-git
depends = python
- conflicts = python2-odfpy-git
conflicts = python-odfpy
+ conflicts = python2-odfpy
conflicts = odfpy
conflicts = odfpy-git
pkgname = python2-odfpy-git
depends = python2
- conflicts = python-odfpy-git
+ depends = python-odfpy-git
conflicts = python2-odfpy
conflicts = odfpy
conflicts = odfpy-git
diff --git a/PKGBUILD b/PKGBUILD
index 454a8f9e5de7..05b00d8e8c10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Sascha Shaw <sascha.shaw@t-online.de>
pkgname=('python-odfpy-git' 'python2-odfpy-git')
pkgbase='python-odfpy-git'
-pkgver=1.3
+pkgver=1.3.3
pkgrel=1
pkgdesc='tools and libraries for manipulating OpenDocument 1.2 files in Python'
arch=(any)
@@ -33,16 +33,23 @@ build() {
package_python-odfpy-git() {
depends=('python')
- conflicts=('python2-odfpy-git' 'python-odfpy' 'odfpy' 'odfpy-git')
+ conflicts=('python-odfpy' 'python2-odfpy' 'odfpy' 'odfpy-git')
cd "$srcdir/$_gitname-build"
+ python setup.py build
python setup.py install --root="$pkgdir/"
}
+# The python2 version depends on the python3 version at the moment
+# until I find a more elegant way to split the tools.
+
package_python2-odfpy-git() {
- depends=('python2')
- conflicts=('python-odfpy-git' 'python2-odfpy' 'odfpy' 'odfpy-git')
+depends=('python2' 'python-odfpy-git')
+ conflicts=('python2-odfpy' 'odfpy' 'odfpy-git')
cd "$srcdir/$_gitname-build"
+ python2 setup.py build
python2 setup.py install --root="$pkgdir/"
+ rm -r $pkgdir/usr/bin
+ rm -r $pkgdir/usr/share
}
# vim:set ts=2 sw=2 et: