Remove conflict with opencl-intel

opencl-intel is also provided by intel-opencl-runtime which probably
should not conflict with this one.

Thanks to satcom886 for suggesting.

2 files changed, 3 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccf9e5c2a841..48a592af1ca7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = beignet-git
 	pkgdesc = An open source OpenCL implementation for Intel IvyBridge & Haswell iGPUs
 	pkgver = 1.0.0.r1395.g419c0417
-	pkgrel = 1
+	pkgrel = 2
 	url = https://01.org/beignet
 	arch = x86_64
 	license = LGPL
@@ -19,7 +19,6 @@ pkgbase = beignet-git
 	provides = opencl-intel
 	provides = opencl-driver
 	conflicts = beignet
-	conflicts = opencl-intel
 	source = git+https://github.com/intel/beignet.git
 	source = GBE-let-GenRegister-reg-never-return-uninitialized-m.patch
 	source = llvm8.patch
diff --git a/PKGBUILD b/PKGBUILD
index 342e9c92dc06..cf36491a15a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 
 pkgname=beignet-git
 pkgver=1.0.0.r1395.g419c0417
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source OpenCL implementation for Intel IvyBridge & Haswell iGPUs"
 arch=(x86_64)
 url="https://01.org/beignet"
@@ -21,7 +21,7 @@ license=(LGPL)
 depends=(glu clang70 mesa opencl-headers)
 makedepends=(git llvm70 cmake ninja python ocl-icd)
 provides=(beignet opencl-intel opencl-driver)
-conflicts=(beignet opencl-intel)
+conflicts=(beignet)
 source=("git+https://github.com/intel/beignet.git"
         'GBE-let-GenRegister-reg-never-return-uninitialized-m.patch'
         'llvm8.patch'