aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2019-07-16 16:05:57 +0200
committerbartus2019-07-16 16:13:36 +0200
commitd5bc8a15c859d2abcacac1265295922689244be6 (patch)
treea02687f71b243160cb8ae4b40cf560b5db98252c
parent2ff67261a59e306d1014224f89078d902de1b54d (diff)
downloadaur-d5bc8a15c859d2abcacac1265295922689244be6.tar.gz
update conflicts as blender 2.80rc1 landed in Arch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac64058213a9..e87aa13878e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -33,8 +33,8 @@ pkgbase = blender-2.8-git
depends = libtiff
depends = libpng
optdepends = cuda: CUDA support in Cycles
- provides = blender-2.8
- conflicts = blender-2.8
+ provides = blender=2.80
+ conflicts = blender
source = git://git.blender.org/blender.git#branch=master
source = blender-addons.git::git://git.blender.org/blender-addons.git
source = blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git
diff --git a/PKGBUILD b/PKGBUILD
index 0e0c034bdce8..b2cb44c72db2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@ depends=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg' 'desktop-file-util
'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng')
optdepends=('cuda: CUDA support in Cycles')
makedepends=('git' 'cmake' 'boost' 'mesa' 'llvm')
-provides=('blender-2.8')
-conflicts=('blender-2.8')
+provides=('blender=2.80')
+conflicts=('blender')
license=('GPL')
install=blender.install
# NOTE: the source array has to be kept in sync with .gitmodules