summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Haag2018-02-27 10:03:12 +0100
committerChristoph Haag2018-02-27 10:03:12 +0100
commit945b4b866450ff8a0a7d4c8a40479331911d3911 (patch)
tree6e7eaf4340da7dc50dd72b4965563227bcbeb9f7
parente3e2653a0ae830c050561f36c5c6995d2f4b861b (diff)
downloadaur-945b4b866450ff8a0a7d4c8a40479331911d3911.tar.gz
conflict with wine-git
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5cfefdebe95e..dcdf1604a6f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Feb 27 09:02:01 UTC 2018
+# Tue Feb 27 09:03:10 UTC 2018
pkgbase = wine-vulkan-git
pkgdesc = A compatibility layer for running Windows programs (git version)
pkgver = r122676.5557ebd4ff
@@ -128,6 +128,7 @@ pkgbase = wine-vulkan-git
conflicts = wine-staging-git
conflicts = bin32-wine
conflicts = wine-wow64
+ conflicts = wine-git
replaces = bin32-wine
options = staticlibs
source = wine-vulkan-git::git+https://github.com/roderickc/wine-vulkan.git
diff --git a/PKGBUILD b/PKGBUILD
index 5812c6b5a852..604c5ebef7ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -86,11 +86,11 @@ then
makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
optdepends=(${optdepends[@]/*32-*/})
provides=("wine=${pkgver}")
- conflicts=('wine' 'wine-staging' 'wine-staging-git')
+ conflicts=('wine' 'wine-staging' 'wine-staging-git' 'wine-git')
else
makedepends=(${makedepends[@]} ${_depends[@]})
provides=("wine=${pkgver}" "bin32-wine=${pkgver}" "wine-wow64=${pkgver}")
- conflicts=('wine' 'wine-staging' 'wine-staging-git' 'bin32-wine' 'wine-wow64')
+ conflicts=('wine' 'wine-staging' 'wine-staging-git' 'bin32-wine' 'wine-wow64' 'wine-git')
replaces=('bin32-wine')
fi