summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfn20062022-09-24 16:43:08 +0100
committerfn20062022-09-24 16:43:08 +0100
commitccec983e9f1b447253128353c1718ce1413843d5 (patch)
treef7c63e3ef6897bc6ce39d4c2a58eea3fbf231797
parent402744f179f0a7b86a2df45bdf42a8d3503a4a7f (diff)
downloadaur-ccec983e9f1b447253128353c1718ce1413843d5.tar.gz
add polymc to conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 656bfddfcf4e..f55a0cb71e98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,7 @@ pkgbase = pollymc-qt5-bin
optdepends = java-runtime=17: support for Minecraft versions >= 1.17
provides = pollymc
provides = pollymc-qt5
+ conflicts = polymc
conflicts = pollymc
conflicts = pollymc-qt5
noextract = PollyMC-Linux-1.4.2.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index e33b04b624d5..5401de44e99a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ url="https://github.com/fn2006/PollyMC"
license=('GPL3')
depends=('java-runtime' 'libgl' 'qt5-base' 'qt5-svg' 'qt5-imageformats' 'zlib' 'hicolor-icon-theme')
provides=('pollymc' 'pollymc-qt5')
-conflicts=('pollymc' 'pollymc-qt5')
+conflicts=('polymc' 'pollymc' 'pollymc-qt5')
optdepends=('java-runtime=8: support for Minecraft versions < 1.17'
'java-runtime=17: support for Minecraft versions >= 1.17')
source=("https://github.com/fn2006/PollyMC/releases/download/${pkgver}/PollyMC-Linux-${pkgver}.tar.gz")