summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-06-29 19:13:39 +0000
committerDaniel Bermond2019-06-29 19:13:39 +0000
commit224a84937962ce8573885ee01850f88025a5d04c (patch)
treefd6ef80dedf85b359d43ff8d0a864945a9f7fa07
parent34eb4f678f5d8a54f906ddd7a0b5a9c4192aaadc (diff)
downloadaur-224a84937962ce8573885ee01850f88025a5d04c.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 01bdcfdc34b..30602eab9a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework
pkgver = 0.8.2.r18962.gd8de69d621
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://caffe2.ai/
arch = x86_64
@@ -104,6 +104,7 @@ pkgname = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (cpu only, git version)
provides = caffe2
provides = caffe2-cpu-git
+ conflicts = python-pytorch
conflicts = caffe2
conflicts = caffe2-cpu-git
replaces = caffe2-cpu-git
@@ -125,5 +126,6 @@ pkgname = caffe2-cuda-git
provides = caffe2
provides = caffe2-git
provides = caffe2-cuda
+ conflicts = python-pytorch
conflicts = caffe2
diff --git a/PKGBUILD b/PKGBUILD
index 17f584d2a68..ed312e0299b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=caffe2-git
pkgname=('caffe2-git' 'caffe2-cuda-git')
pkgver=0.8.2.r18962.gd8de69d621
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='A new lightweight, modular, and scalable deep learning framework'
arch=('x86_64')
@@ -214,7 +214,7 @@ package_caffe2-cuda-git() {
pkgdesc+=' (with cuda support, git version)'
depends+=('cuda' 'cudnn' 'nccl')
provides=('caffe2' 'caffe2-git' 'caffe2-cuda')
- conflicts=('caffe2')
+ conflicts+=('caffe2')
cd pytorch/build-cuda
@@ -224,7 +224,7 @@ package_caffe2-cuda-git() {
package_caffe2-git() {
pkgdesc+=' (cpu only, git version)'
provides=('caffe2' 'caffe2-cpu-git')
- conflicts=('caffe2' 'caffe2-cpu-git')
+ conflicts+=('caffe2' 'caffe2-cpu-git')
replaces=('caffe2-cpu-git')
cd pytorch/build-cpu-only