Click here to go back to the commit logs for pollymc-bin.

Commit:

---

Hash: 257e8071091a2d6197ea02035d9535f4833ebb7d

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

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 9f0b63c..548328b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@ generated-by = makedeb-makepkg
 pkgbase = prismlauncher-bin
 	pkgdesc = Minecraft launcher with ability to manage multiple instances.
 	pkgver = 5.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/PrismLauncher/PrismLauncher
 	arch = i686
 	arch = amd64
@@ -18,6 +18,7 @@ pkgbase = prismlauncher-bin
 	optdepends = java-runtime=17: support for Minecraft versions >= 1.17
 	provides = prismlauncher
 	conflicts = prismlauncher
+	conflicts = polymc
 	source = https://github.com/PrismLauncher/PrismLauncher/releases/download/5.0/PrismLauncher-Linux-5.0.tar.gz
 	sha256sums = 7e5f8753134418a65ab11043563cb45880c0adc5a2c1a5c2897dd9de068e2e39
 
diff --git a/PKGBUILD b/PKGBUILD
index e4ac8e1..91869b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=prismlauncher-bin
 pkgver=5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'amd64')
 url="https://github.com/PrismLauncher/PrismLauncher"
 license=('GPL3')
 depends=('libqt5svg5' 'qt5-image-formats-plugins' 'libqt5xml5' 'libqt5core5a' 'libqt5network5' 'libqt5gui5')
 provides=('prismlauncher')
-conflicts=('prismlauncher')
+conflicts=('prismlauncher' 'polymc')
 optdepends=('java-runtime=8: support for Minecraft versions < 1.17'
             'java-runtime=17: support for Minecraft versions >= 1.17')
 source=("https://github.com/PrismLauncher/PrismLauncher/releases/download/${pkgver}/PrismLauncher-Linux-${pkgver}.tar.gz")