Add java-language-server-git as a conflicting package

2 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4b1a596a61f..425cb6c5481b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = java-language-server
 	pkgdesc = Java language server using the Java compiler API
 	pkgver = 0.2.13
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/georgewfraser/java-language-server.git
 	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = maven
 	depends = java-runtime
+	provides = java-language-server
+	conflicts = java-language-server-git
 	source = java-language-server::git+https://github.com/georgewfraser/java-language-server.git#commit=e747b6bce6740066755e3fa6fa12eb9c7263660c
 	source = launcher.sh
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8131763e0f44..f9f1caab81c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,16 @@
 pkgname=java-language-server
 pkgver=0.2.13
 _commit=e747b6bce6740066755e3fa6fa12eb9c7263660c
-pkgrel=2
+pkgrel=3
 pkgdesc="Java language server using the Java compiler API"
 arch=(any)
 url="https://github.com/georgewfraser/java-language-server.git"
 license=('MIT')
+conflicts=('java-language-server-git')
+provides=('java-language-server')
 depends=('java-runtime')
 makedepends=('git' 'maven')
-source=("${pkgname}::git+https://github.com/georgewfraser/java-language-server.git#commit=$_commit"
+source=("${pkgname}::git+${url}#commit=$_commit"
         "launcher.sh")
 sha256sums=('SKIP'
             '2010843d40c0612dd7884d53645435001190623c471b43a2e71d5434e9bca6e3')