summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMckol2022-03-25 16:02:58 +0100
committerMckol2022-03-25 16:02:58 +0100
commitd5f39ccaf033bc1c9783da56de1d68f7c45ca215 (patch)
tree23cf0ac6564690c008125faee20b562f78d33da5
parent5345d7037626e95ac6a6206620a1c94b9d2dabea (diff)
downloadaur-d5f39ccaf033bc1c9783da56de1d68f7c45ca215.tar.gz
Apparently the 'provides' array doesn't imply a conflict. Undo the last commit.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abfb82eabbda..0b4cbc51b14f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = airshipper-git
pkgdesc = The official launcher for Veloren - an open-world, open-source multiplayer voxel RPG
pkgver = 0.7.0.r0.f4642c9
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.com/veloren/airshipper
arch = x86_64
arch = i686
@@ -13,6 +13,7 @@ pkgbase = airshipper-git
depends = libxcb
depends = bzip2
provides = airshipper
+ conflicts = airshipper
noextract = airshipper.desktop
noextract = veloren.png
source = airshipper-git::git+https://gitlab.com/veloren/airshipper.git
diff --git a/PKGBUILD b/PKGBUILD
index 0cc8859fcdf7..8fd2bb76d1da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
export GIT_LFS_SKIP_SMUDGE=1 # This is to prevent Git LFS errors
pkgname=airshipper-git
pkgver=0.7.0.r0.f4642c9
-pkgrel=1
+pkgrel=2
pkgdesc="The official launcher for Veloren - an open-world, open-source multiplayer voxel RPG"
arch=('x86_64' 'i686')
url='https://gitlab.com/veloren/airshipper'
@@ -12,7 +12,7 @@ license=('GPL3')
depends=('openssl' 'libxcb' 'bzip2')
makedepends=('git' 'rustup' 'git-lfs')
provides=('airshipper')
-conflicts=()
+conflicts=('airshipper')
_repo='https://gitlab.com/veloren/airshipper.git'
source=(
"$pkgname"::"git+$_repo"