summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammadreza Abdollahzadeh2019-10-05 14:38:31 +0330
committerMohammadreza Abdollahzadeh2019-10-05 14:38:31 +0330
commitd2e42e7aa2a59dec24ab23c0375ce50f08f4dfb3 (patch)
tree10c983d7ecdb27915a5df429c757f051c85fe97c
parent571b91c0822ffa1ecec369e3867d2f3a08eab035 (diff)
downloadaur-d2e42e7aa2a59dec24ab23c0375ce50f08f4dfb3.tar.gz
fix conflict array
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57a247418a3d..fb2ebecc09d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = java-openjfx-bin
pkgdesc = Java OpenJFX 13 client application platform (Gluon build).
pkgver = 13
- pkgrel = 1
+ pkgrel = 2
url = https://openjfx.io/
arch = x86_64
license = GPL2
@@ -13,6 +13,7 @@ pkgbase = java-openjfx-bin
depends = webkit2gtk
provides = java-openjfx=13
conflicts = java-openjfx=13
+ conflicts = java13-openjfx
source = https://download2.gluonhq.com/openjfx/13/openjfx-13_linux-x64_bin-sdk.zip
source = https://download2.gluonhq.com/openjfx/13/openjfx-13_linux-x64_bin-jmods.zip
sha256sums = 6f2d1ed4678615d909546b2b4a88f710fd7367bb78a0d7c195ee4645a4c7efc5
diff --git a/PKGBUILD b/PKGBUILD
index 3cf0f838b3c7..26de1c1aeced 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
pkgname=java-openjfx-bin
_majorver=13
pkgver=13
-pkgrel=1
+pkgrel=2
pkgdesc="Java OpenJFX ${_majorver} client application platform (Gluon build)."
arch=('x86_64')
url='https://openjfx.io/'
license=('GPL2')
depends=('ffmpeg' 'gstreamer' "java-environment>=${_majorver}" 'libxtst' 'qt5-base' 'webkit2gtk')
-provides=("java-openjfx=${pkgver}")
-conflicts=("java-openjfx=${pkgver}")
+provides=("java-openjfx=${_majorver}")
+conflicts=("java-openjfx=${_majorver}" "java${_majorver}-openjfx")
source=("https://download2.gluonhq.com/openjfx/${pkgver}/openjfx-${pkgver}_linux-x64_bin-sdk.zip"
"https://download2.gluonhq.com/openjfx/${pkgver}/openjfx-${pkgver}_linux-x64_bin-jmods.zip")
sha256sums=('6f2d1ed4678615d909546b2b4a88f710fd7367bb78a0d7c195ee4645a4c7efc5'