summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-07-09 11:14:18 +0200
committerErich Eckner <git@eckner.net>2018-07-09 11:14:18 +0200
commite092e90afc3d5c8c882971932e53bdfb817a5cb4 (patch)
treef43d5917d6f537352b949143078dae3aa3edd581
parent8050dab1ed63991a77a66e805f3a675198570203 (diff)
downloadarchlinuxewe.git.save-e092e90afc3d5c8c882971932e53bdfb817a5cb4.tar.xz
python-silx: remove file conflicts
-rw-r--r--python-silx/PKGBUILD5
1 files changed, 5 insertions, 0 deletions
diff --git a/python-silx/PKGBUILD b/python-silx/PKGBUILD
index c60c238c..feccfeec 100644
--- a/python-silx/PKGBUILD
+++ b/python-silx/PKGBUILD
@@ -49,6 +49,11 @@ package_python2-silx() {
cd "${srcdir}/py2-${pkgname#*-}-${pkgver}"
python2 setup.py install --root="${pkgdir}/" --optimize=1
install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ mv "${pkgdir}/usr/bin/silx" "${pkgdir}/usr/bin/silx2"
+ sed -i '1 s/python/python2/' "${pkgdir}/usr/bin/silx2"
+ mv \
+ "${pkgdir}/usr/silx/third_party/_local/scipy_spatial/qhull/COPYING.txt"
+ "${pkgdir}/usr/silx/third_party/_local/scipy_spatial/qhull/COPYING2.txt"
}
package_python-silx() {