summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Barnett2015-08-11 20:48:44 -0500
committerJames Barnett2015-08-11 20:48:44 -0500
commit3c0dd70d5cbdaedd3062ea74faa95bf34bd1adda (patch)
tree7f91af5cd9d1d35321313c302cd2b35e3bec6b97
parentef27add0a4d2b61d39f8afa37bdaaff9fbd99507 (diff)
downloadaur-3c0dd70d5cbdaedd3062ea74faa95bf34bd1adda.tar.gz
add conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6d61a27e4261..1d0a4489af15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gromacs-git
pkgdesc = A versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles. Development branch.
pkgver = 5.1.beta1.r121.gabc4a07
- pkgrel = 1
+ pkgrel = 2
url = http://www.gromacs.org/
arch = i686
arch = x86_64
@@ -15,6 +15,7 @@ pkgbase = gromacs-git
optdepends = libx11: needed for gmx view
optdepends = lesstif: needed for gmx view
optdepends = vmd: visualization
+ conflicts = gromacs
options = !libtool
source = git://git.gromacs.org/gromacs.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f30be096dbe9..be6dc9cc4b08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: James W. Barnett <jbarnet4@tulane.edu>
pkgname=gromacs-git
pkgver=5.1.beta1.r121.gabc4a07
-pkgrel=1
+pkgrel=2
pkgdesc='A versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles. Development branch.'
url='http://www.gromacs.org/'
license=("LGPL")
@@ -18,6 +18,7 @@ optdepends=('openmpi: needed for parallelization across nodes'
options=('!libtool')
source=(git://git.gromacs.org/gromacs.git)
sha1sums=('SKIP')
+conflicts=('gromacs')
build() {
mkdir -p ${srcdir}/gromacs/build