summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartino Pilia2018-01-22 11:02:19 +0100
committerMartino Pilia2018-01-22 11:02:19 +0100
commitddb26fbcf75c19184966cc5f0b491b03e92415e5 (patch)
tree77b4d23309dca60dacd176b5523cf3f510cb8a66
parent047077dbdacd76c3af6051397292f4f673f65961 (diff)
downloadaur-ddb26fbcf75c19184966cc5f0b491b03e92415e5.tar.gz
update dependencies and conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 5 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9e66d3eb752b..885b0cc19396 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
pkgbase = elastix-git
pkgdesc = Toolbox for rigid and nonrigid registration of images
pkgver = 4.304@3344.r945.g522843d9
- pkgrel = 1
+ pkgrel = 2
url = http://elastix.isi.uu.nl/
arch = x86_64
license = apache
makedepends = cmake
depends = insight-toolkit
provides = elastix
+ conflicts = elastix-bin
+ conflicts = elastix
source = git+https://github.com/SuperElastix/elastix.git
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7aa2bf607cee..41b9fa6862c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=elastix
pkgname=${_pkgname}-git
pkgver=4.304@3344.r945.g522843d9
-pkgrel=1
+pkgrel=2
pkgdesc='Toolbox for rigid and nonrigid registration of images'
arch=('x86_64')
url='http://elastix.isi.uu.nl/'
@@ -11,6 +11,7 @@ provides=('elastix')
depends=('insight-toolkit')
makedepends=('cmake')
optdepends=()
+conflicts=('elastix-bin' 'elastix')
source=('git+https://github.com/SuperElastix/elastix.git')
sha512sums=('SKIP')
@@ -47,10 +48,6 @@ package() {
make install
- mkdir elastix
- mv $pkgdir/usr/include/* elastix/.
- mv elastix $pkgdir/usr/include/.
-
cd ..
install -D -m644 \