Click here to go back to the commit logs for xivlauncher-git.

Commit:

---

Hash: f76b369bbd37f87caf6e632cba28986a8962c57b

Message: Chore: conflict with xivlauncher-rb

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index dbee199..b6a5ccc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,11 +2,12 @@ generated-by = makedeb
 pkgname = xivlauncher-git
 pkgbase = xivlauncher-git
 pkgdesc = Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)
-pkgrel = 1
+pkgrel = 2
 pkgver = 1.0.6.0.r1.7a7d8d3
 url = https://github.com/goatcorp/FFXIVQuickLauncher/
 arch = amd64
 conflicts = xivlauncher
+conflicts = xivlauncher-rb
 depends = build-essential
 depends = aria2
 depends = libsdl2-2.0-0
diff --git a/PKGBUILD b/PKGBUILD
index c266611..6e51a7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: XIVLauncher Linux Maintainers <franz@goat.place>
 pkgname=xivlauncher-git
 pkgver=1.0.6.0.r1.7a7d8d3
-pkgrel=1
+pkgrel=2
 #epoch=2
 pkgdesc="Custom Launcher for Final Fantasy XIV Online (Crossplatform rewrite)"
 arch=('amd64')
@@ -35,7 +35,10 @@ optdepends=('steam')
 options=('!strip')
 extensions=()
 provides=("xivlauncher=${pkgver}")
-conflicts=("xivlauncher")
+conflicts=(
+    "xivlauncher"
+    "xivlauncher-rb"
+)
 source=(
     "XIVLauncher.Core::git+https://github.com/goatcorp/XIVLauncher.Core.git"
     "XIVLauncher.desktop"