summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJia Li2016-07-13 15:11:12 -0400
committerJia Li2016-07-13 15:11:12 -0400
commitb6294be3ff97313e73155fa5e0b2e64105336ff8 (patch)
treeceef6ec130eb2ffbeeb64b6826f3ed67acf775f9
parentc4ac04313dfd136e871f9995ea13d7a208e9f53a (diff)
downloadaur-b6294be3ff97313e73155fa5e0b2e64105336ff8.tar.gz
add conflict
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5020f36231e4..652c901934ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = nfft
depends = fftw
optdepends = openmp: for OpenMP support
provides = nfft=3.3.1
+ conflicts = nfft-git
source = https://www-user.tu-chemnitz.de/~potts/nfft/download/nfft-3.3.1.tar.gz
md5sums = 8c0516e3252ff39a245e62f1a59d0165
diff --git a/PKGBUILD b/PKGBUILD
index d7da3b86b73e..7ab0b75e3783 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,6 +9,7 @@ license=('GPL2')
depends=('fftw')
optdepends=('openmp: for OpenMP support')
provides=($pkgname=$pkgver)
+conflicts=('nfft-git')
source=("https://www-user.tu-chemnitz.de/~potts/nfft/download/$pkgname-$pkgver.tar.gz")
md5sums=('8c0516e3252ff39a245e62f1a59d0165')