Click here to go back to the commit logs for fjordlauncher.

Commit:

---

Hash: 4cd621fab1a3f629717b75f1c15efa3d83703dde

Message: fix: conflict with polymc Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index b5b7f3f..54be0b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@ generated-by = makedeb-makepkg
 pkgbase = prismlauncher
 	pkgdesc = Minecraft launcher with ability to manage multiple instances.
 	pkgver = 5.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://prismlauncher.org
 	arch = i686
 	arch = amd64
@@ -29,6 +29,7 @@ pkgbase = prismlauncher
 	depends = libqt5gui5
 	optdepends = java-runtime=8: support for Minecraft versions < 1.17
 	optdepends = java-runtime=17: support for Minecraft versions >= 1.17
+	conflicts = polymc
 	source = https://github.com/PrismLauncher/PrismLauncher/releases/download/5.0/PrismLauncher-5.0.tar.gz
 	sha256sums = 27c2c7e0c9aaa3450b7449683cfd2a9a941b7118ab83947de09285438e03c495
 
diff --git a/PKGBUILD b/PKGBUILD
index c45e6cb..a880e5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=prismlauncher
 pkgver=5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'amd64')
 url="https://prismlauncher.org"
@@ -12,8 +12,8 @@ depends=('libqt5svg5' 'qt5-image-formats-plugins' 'libqt5xml5' 'libqt5core5a' 'l
 makedepends=('scdoc' 'extra-cmake-modules' 'cmake' 'git' 'openjdk-17-jdk' 'zlib1g-dev' 'libgl1-mesa-dev' 'qtbase5-dev' 'qtchooser' 'qt5-qmake' 'qtbase5-dev-tools' 'gcc' 'g++')
 optdepends=('java-runtime=8: support for Minecraft versions < 1.17'
             'java-runtime=17: support for Minecraft versions >= 1.17')	    
+conflicts=('polymc')
 source=("https://github.com/PrismLauncher/PrismLauncher/releases/download/$pkgver/PrismLauncher-$pkgver.tar.gz")
-
 sha256sums=("27c2c7e0c9aaa3450b7449683cfd2a9a941b7118ab83947de09285438e03c495")
 
 build() {