Update to 19.0b1-3

2 files changed, 18 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e8850e64b65..19b44b914ce1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-devel
 	pkgver = 19.0b1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -97,7 +97,7 @@ pkgname = kodi-devel
 	depends = python-simplejson
 	depends = xorg-xdpyinfo
 	depends = shairplay
-	depends = KODI-BIN
+	depends = KODI-DEVEL-BIN
 	depends = libplist
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
@@ -107,6 +107,7 @@ pkgname = kodi-devel
 	provides = xbmc
 	provides = kodi=19.0b1
 	conflicts = xbmc
+	conflicts = kodi
 	replaces = xbmc
 
 pkgname = kodi-devel-x11
@@ -132,8 +133,9 @@ pkgname = kodi-devel-x11
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
-	provides = KODI-BIN
+	provides = KODI-DEVEL-BIN
 	provides = kodi-x11=19.0b1
+	conflicts = kodi-x11
 	replaces = kodi-bin
 
 pkgname = kodi-devel-wayland
@@ -159,8 +161,9 @@ pkgname = kodi-devel-wayland
 	depends = tinyxml
 	depends = waylandpp
 	depends = kodi-devel
-	provides = KODI-BIN
+	provides = KODI-DEVEL-BIN
 	provides = kodi-wayland=19.0b1
+	conflicts = kodi-wayland
 
 pkgname = kodi-devel-gbm
 	pkgdesc = gbm kodi binary
@@ -185,8 +188,9 @@ pkgname = kodi-devel-gbm
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
-	provides = KODI-BIN
+	provides = KODI-DEVEL-BIN
 	provides = kodi-gbm=19.0b1
+	conflicts = kodi-gbm
 
 pkgname = kodi-devel-eventclients
 	pkgdesc = Kodi Event Clients
diff --git a/PKGBUILD b/PKGBUILD
index 78d345398111..3f6ef929fce3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=(
 )
 pkgver=19.0b1
 #_major=18.7.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -228,7 +228,7 @@ package_kodi-devel() {
   depends=(
     'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex'
     'python-pillow' 'python-simplejson' 'xorg-xdpyinfo' 'shairplay'
-    'KODI-BIN' 'libplist'
+    'KODI-DEVEL-BIN' 'libplist'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
@@ -238,7 +238,7 @@ package_kodi-devel() {
     'upower: Display battery level'
   )
   provides=('xbmc' "kodi=${pkgver}")
-  conflicts=('xbmc')
+  conflicts=('xbmc' 'kodi')
   replaces=('xbmc')
 
   _components=(
@@ -265,7 +265,8 @@ package_kodi-devel() {
 
 package_kodi-devel-x11() {
   pkgdesc="x11 kodi binary"
-  provides=('KODI-BIN' "kodi-x11=${pkgver}")
+  provides=('KODI-DEVEL-BIN' "kodi-x11=${pkgver}")
+  conflicts=('kodi-x11')
   replaces=('kodi-bin')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
@@ -284,7 +285,8 @@ package_kodi-devel-x11() {
 
 package_kodi-devel-wayland() {
   pkgdesc="wayland kodi binary"
-  provides=('KODI-BIN' "kodi-wayland=${pkgver}")
+  provides=('KODI-DEVEL-BIN' "kodi-wayland=${pkgver}")
+  conflicts=('kodi-wayland')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
@@ -301,7 +303,8 @@ package_kodi-devel-wayland() {
 
 package_kodi-devel-gbm() {
   pkgdesc="gbm kodi binary"
-  provides=('KODI-BIN' "kodi-gbm=${pkgver}")
+  provides=('KODI-DEVEL-BIN' "kodi-gbm=${pkgver}")
+  conflicts=('kodi-gbm')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'