summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLenny McLennington2021-12-14 15:31:16 +0000
committerLenny McLennington2021-12-14 15:32:22 +0000
commit73e2844de04e5e9afe9bc457eeb44c1a15b07aa3 (patch)
treef5f41c17be4fcd3546ba38a1c76cc14edb7776fb
parenteeb275141a2293dfee3b3bff1e1c1d444667d5ab (diff)
downloadaur-73e2844de04e5e9afe9bc457eeb44c1a15b07aa3.tar.gz
update conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f35ff84db79b..6120a0899120 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,9 +19,6 @@ pkgbase = multimc-git
optdepends = xorg-xrandr: for older minecraft versions
provides = multimc
conflicts = multimc
- conflicts = multimc5
- conflicts = multimc-bin
- conflicts = multimc-native
source = git+https://github.com/MultiMC/Launcher
source = git+https://github.com/MultiMC/libnbtplusplus
source = git+https://github.com/MultiMC/quazip
diff --git a/PKGBUILD b/PKGBUILD
index f0a056ce315a..89e5c053e58b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ url="https://github.com/MultiMC/Launcher"
license=('Apache')
depends=('java-runtime' 'libgl' 'qt5-base' 'zlib')
provides=('multimc')
-conflicts=('multimc' 'multimc5' 'multimc-bin' 'multimc-native')
+conflicts=('multimc')
makedepends=('cmake' 'git' 'java-environment')
optdepends=('glfw: to use system GLFW libraries'
'openal: to use system OpenAL libraries'