summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Zhang2018-08-22 20:05:02 +0800
committerBruce Zhang2018-08-22 20:05:02 +0800
commit4663f6600ab61ebd4c9a2b66ae6e4b3a73e00eef (patch)
tree4ac41654a62377338a307ac856cd5df2c190bd01
parentbabaecf78c6bad9ef8fac626857c50ad96f1f34e (diff)
downloadaur-4663f6600ab61ebd4c9a2b66ae6e4b3a73e00eef.tar.gz
fix conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 17cd849695f3..ed647ea07ee0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
pkgbase = spirv-headers-git
pkgdesc = SPIR-V header files Git version
pkgver = r110.2c51218
- pkgrel = 1
+ pkgrel = 2
url = https://www.khronos.org/registry/spir-v/
arch = any
license = custom
+ provides = spirv-headers
+ conflicts = spirv-headers
source = git://github.com/KhronosGroup/SPIRV-Headers.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 86023a4a1d4c..ddeaf6c1bb41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,15 @@
# Maintainer: Bruce Zhang
pkgname=spirv-headers-git
pkgver=r110.2c51218
-pkgrel=1
+pkgrel=2
pkgdesc='SPIR-V header files Git version'
arch=('any')
url='https://www.khronos.org/registry/spir-v/'
license=('custom')
source=('git://github.com/KhronosGroup/SPIRV-Headers.git')
sha1sums=('SKIP')
+conflicts=('spirv-headers')
+provides=('spirv-headers')
pkgver() {
cd "${srcdir}/SPIRV-Headers"