fix conflicts

2 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 116150177c2a..ced4a98db05c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = invader-git
-	pkgdesc = An open source toolkit for creating maps and assets for Halo: Combat Evolved
-	pkgver = 0.40.1.r3039.43a91737
+	pkgdesc = An open source toolkit for creating maps and assets for Halo: Combat Evolved (git build)
+	pkgver = 0.41.0.r3050.185c8625
 	pkgrel = 1
 	url = https://invader.opencarnage.net
 	arch = x86_64
@@ -21,6 +21,7 @@ pkgbase = invader-git
 	depends = zlib
 	depends = zstd
 	provides = invader
+	conflicts = invader
 	source = git+https://github.com/SnowyMouse/invader.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index edc94b2aa91c..26b7e5f97b35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,34 @@
 # Maintainer: Vaporeon <vaporeon@vaporeon.io>
 
 pkgname=invader-git
-pkgver=0.40.1.r3039.43a91737
+pkgver=0.41.0.r3050.185c8625
 pkgrel=1
-pkgdesc="An open source toolkit for creating maps and assets for Halo: Combat Evolved"
-depends=('libtiff' 'libarchive' 'libsquish' 'flac' 'freetype2' 'libsamplerate' 'libvorbis' 'qt5-base' 'qt5-multimedia' 'zlib' 'zstd')
+pkgdesc="An open source toolkit for creating maps and assets for Halo: Combat Evolved (git build)"
+depends=('libtiff' 'libarchive' 'libsquish' 'flac' 'freetype2' 'libsamplerate'
+         'libvorbis' 'qt5-base' 'qt5-multimedia' 'zlib' 'zstd')
 makedepends=('cmake' 'git' 'ninja' 'python')
 arch=('x86_64')
 url="https://invader.opencarnage.net"
 license=('GPL3')
-source=('git+https://github.com/SnowyMouse/invader.git')
+source=("git+https://github.com/SnowyMouse/${pkgname%-git}.git")
 sha256sums=('SKIP')
 provides=('invader')
+conflicts=('invader')
 
 pkgver() {
-    cd "$srcdir"/invader
+    cd "$srcdir"/${pkgname%-git}
     printf "%s.r%s.%s" "$(git describe --abbrev=0 --tags)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd "$srcdir"
     mkdir -p build
 }
 
 build() {
     cd "$srcdir"/build
-    cmake ../invader -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$pkgdir/usr"
+    cmake ../${pkgname%-git} -G Ninja \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX="$pkgdir/usr"
     ninja
 }