summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2017-10-04 01:38:10 +0300
committerDet2017-10-04 01:38:10 +0300
commitc330a52567f8499c1e1e7b960cdd26f754ed1533 (patch)
tree93c12b1faaa2775127f9561c8eaf86d7d83caf79
parentde3ef50d94acdee47cd317aeeb5e3b7f145e4a7f (diff)
downloadaur-c330a52567f8499c1e1e7b960cdd26f754ed1533.tar.gz
Add conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4019dda36d64..33cf0abeb155 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,6 +24,8 @@ pkgbase = jdk
provides = java-web-start-jre=9
provides = java-environment-jdk=9
provides = java-openjfx=9
+ conflicts = java-runtime-jre=9
+ conflicts = java-environment-jdk=9
options = !strip
backup = etc/java-jdk9/management/jmxremote.access
backup = etc/java-jdk9/management/management.properties
diff --git a/PKGBUILD b/PKGBUILD
index c41a9e1f9035..824f6f10275f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,6 +18,7 @@ optdepends=('alsa-lib: for basic sound support'
provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major"
"java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major"
"java-openjfx=$_major")
+conflicts=("java-runtime-jre=$_major" "java-environment-jdk=$_major")
# Variables
DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')