summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Pelaez2017-11-25 16:54:45 -0500
committerMiguel Pelaez2017-11-25 16:54:45 -0500
commit33c969fa2d2a2afefc06c203afac8d0f320b9a76 (patch)
treebfef7fe76ac3dbda24d912c1d1202708a4124b74
parent8304c113a10c4a5b5f4978c40a84d5c0f8145ded (diff)
downloadaur-33c969fa2d2a2afefc06c203afac8d0f320b9a76.tar.gz
Add conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fff87f940ef8..ceafb7a3a4de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,13 +4,14 @@ pkgbase = jdk8-openj9-bin
pkgrel = 1
url = https://adoptopenjdk.net/index.html?variant=openjdk8-openj9
arch = x86_64
- license = custom
+ license = GPL
makedepends = coreutils
makedepends = bash
depends = java-runtime-common
depends = java-environment-common
depends = ca-certificates-utils
depends = nss
+ conflicts = jdk8-j9-bin
provides = java-environment=8
provides = java-runtime=8
provides = java-runtime-headless=8
diff --git a/PKGBUILD b/PKGBUILD
index a3a0e3654a98..789eff0416d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,6 +12,7 @@ arch=('x86_64')
url="https://adoptopenjdk.net/index.html?variant=openjdk8-openj9"
license=('GPL')
depends=('java-runtime-common' 'java-environment-common' 'ca-certificates-utils' 'nss')
+conflicts=('jdk8-j9-bin')
provides=(
'java-environment=8'