summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mattern2016-05-03 01:01:20 +0200
committerPeter Mattern2016-05-03 01:01:20 +0200
commitfca904ea220b3c75573d192fc51d0d6052811864 (patch)
tree14ac223a0e4fb3a12c549459445e5887d1ad4c7f
parent32f32bc80c04ee4ffc2d52dced31524c62092bd3 (diff)
downloadaur-fca904ea220b3c75573d192fc51d0d6052811864.tar.gz
Complement variable conflicts with vtk6
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2aa1443a30c..4fb088d4d96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon May 2 13:59:27 UTC 2016
+# Mon May 2 23:01:11 UTC 2016
pkgbase = vtk-git
pkgdesc = Open-source software system for image processing, 3D graphics, volume rendering and visualization
pkgver = 7.0.0.1245.g99f5e84
- pkgrel = 1
+ pkgrel = 2
url = http://www.vtk.org
arch = i686
arch = x86_64
@@ -20,6 +20,7 @@ pkgbase = vtk-git
depends = gl2ps
provides = vtk
conflicts = vtk
+ conflicts =
source = git+https://gitlab.kitware.com/vtk/vtk.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5df02c5e1e3..6d12240d89f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=vtk
pkgname=$_pkgname-git
pkgver=7.0.0.1245.g99f5e84
-pkgrel=1
+pkgrel=2
pkgdesc='Open-source software system for image processing, 3D graphics, volume rendering and visualization'
arch=('i686' 'x86_64')
url='http://www.vtk.org'
@@ -11,7 +11,7 @@ license=('BSD')
depends=('gl2ps')
makedepends=('git' 'cmake' 'hdf5' 'libjpeg-turbo' 'libtiff' 'doxygen' 'java-environment' 'python' 'tk')
provides=("$_pkgname")
-conflicts=("$_pkgname")
+conflicts=("$_pkgname" "$_pkgname6")
source=("git+https://gitlab.kitware.com/vtk/vtk.git")
sha256sums=("SKIP")