summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2017-10-04 01:38:29 +0300
committerDet2017-10-04 01:38:29 +0300
commitedac0d6f96ecc7fa9c735ecbcc1983ab60e6ca9d (patch)
treeb649cdc7af9c540660fcf6220e185f8768dcc9e1
parent79079988adbab8ccfbad03547d62cb04e65b85ab (diff)
downloadaur-edac0d6f96ecc7fa9c735ecbcc1983ab60e6ca9d.tar.gz
Add conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6078372e2ce..09148b61887 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,7 @@ pkgbase = jre
provides = java-runtime-headless-jre=9
provides = java-web-start-jre=9
provides = java-openjfx=9
+ conflicts = java-runtime-jre=9
backup = etc/java-jre9/management/jmxremote.access
backup = etc/java-jre9/management/management.properties
backup = etc/java-jre9/security/java.policy
diff --git a/PKGBUILD b/PKGBUILD
index ba8113ccc63..439e2f483e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,6 +17,7 @@ optdepends=('alsa-lib: for basic sound support'
provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major"
"java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major"
"java-openjfx=$_major")
+conflicts=("java-runtime-jre=$_major")
# Variables
DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')