summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Knoll2016-09-27 14:38:25 +1000
committerAvi Knoll2016-09-27 14:38:25 +1000
commitde0db886713abca23c34192657337331983823a7 (patch)
tree325886c4c0ca5ff5f34947ff34ab1a257ebeebc4
parentac8e2d04de40fe0d73f3d4bd415c613255edbc18 (diff)
downloadaur-de0db886713abca23c34192657337331983823a7.tar.gz
correct conflicting package mvn -> maven
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b4cefc9d4c14..6ff612eb2c78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,7 @@ pkgbase = mvnvm
arch = any
license = unknown
makedepends = bash
- conflicts = mvn
+ conflicts = maven
source = https://bitbucket.org/mjensen/mvnvm/raw/mvnvm-1.0.8/mvn
sha256sums = 968e09aa2dec3c9374e2fb40aaaa73ef313a31b333abc71ca937a25d9e4a6c89
diff --git a/PKGBUILD b/PKGBUILD
index 1c4295e79fc1..2da6e35320c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Avi Knoll <aknoll@atlassian.com>
pkgname=mvnvm
pkgver=1.0.8
-pkgrel=1
+pkgrel=2
pkgdesc="Run different versions of maven for different projects."
arch=('any')
url="http://mvnvm.org/"
@@ -9,7 +9,7 @@ license=('unknown')
groups=()
depends=()
makedepends=(bash)
-conflicts=(mvn)
+conflicts=(maven)
source=(
https://bitbucket.org/mjensen/mvnvm/raw/mvnvm-${pkgver}/mvn
)