Update provides and conflicts

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52170f9d8ce0..0af94ebfa115 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = caffe
 	pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (cpu only)
 	pkgver = 1.0
-	pkgrel = 11
+	pkgrel = 12
 	url = http://caffe.berkeleyvision.org/
 	arch = i686
 	arch = x86_64
@@ -38,6 +38,8 @@ pkgbase = caffe
 	depends = python-leveldb
 	depends = python-scikit-image
 	depends = python-pydotplus
+	provides = caffe-cpu
+	conflicts = caffe-cpu
 	replaces = caffe-cpu
 	source = caffe-1.0.tar.gz::https://github.com/BVLC/caffe/archive/1.0.tar.gz
 	source = Makefile.config
diff --git a/PKGBUILD b/PKGBUILD
index d4c1695532fd..d8fc96ebc959 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=caffe
 pkgver=1.0
-pkgrel=11
+pkgrel=12
 pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (cpu only)'
 arch=('i686' 'x86_64')
 url='http://caffe.berkeleyvision.org/'
@@ -23,6 +23,8 @@ depends=(
     # https://github.com/BVLC/caffe/blob/1.0/python/caffe/draw.py#L7-L22
 )
 makedepends=('boost' 'doxygen' 'texlive-core')
+provides=('caffe-cpu')
+conflicts=('caffe-cpu')
 replaces=('caffe-cpu')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/BVLC/caffe/archive/${pkgver}.tar.gz"
         'Makefile.config')