summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCrankySupertoon2020-09-28 21:10:55 -0400
committerCrankySupertoon2020-09-28 21:10:55 -0400
commitbde42f006850516def1577212e9c988d2fa1c3a4 (patch)
tree3324ec705fee1fa12dfd60cf67ed87ccf9955e40
parente94646392990dcafc273e80f5a6538cbb92bc9a1 (diff)
downloadaur-bde42f006850516def1577212e9c988d2fa1c3a4.tar.gz
add new conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53fbd766da41..194ea1fe5aa4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = mesen-s-git
depends = mono
depends = sdl2
conflicts = mesen-s
+ conflicts = mesen-s-bin
source = Mesen-S::git+https://github.com/SourMesen/Mesen-S.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 52f29db10ed2..ce05c08a38a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ arch=('x86_64')
makedepends=('clang' 'gendesk' 'zip')
depends=('mono' 'sdl2')
url='https://github.com/SourMesen/Mesen-S'
-conflicts=('mesen-s')
+conflicts=('mesen-s' 'mesen-s-bin')
license=('GPL3')
source=("${_pkgname}::git+https://github.com/SourMesen/Mesen-S.git")
sha256sums=('SKIP')