Update to 18.3rc1pre4-3

2 files changed, 22 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a050a32a05b..bfe1e2027aeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Apr 28 22:16:00 UTC 2019
+# Mon Apr 29 17:49:56 UTC 2019
 pkgbase = kodi-devel
 	pkgver = 18.3rc1pre4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -52,8 +52,8 @@ pkgbase = kodi-devel
 	makedepends = git
 	makedepends = wayland-protocols
 	makedepends = waylandpp
-	makedepends = libxkbcommon
 	makedepends = libinput
+	makedepends = libxkbcommon
 	noextract = libdvdcss-1.4.2-Leia-Beta-5.tar.gz
 	noextract = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
 	noextract = libdvdread-6.0.0-Leia-Alpha-3.tar.gz
@@ -110,9 +110,8 @@ pkgname = kodi-devel
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = shairplay: AirPlay support
 	optdepends = upower: Display battery level
-	provides = xbmc
-	conflicts = xbmc
-	replaces = xbmc
+	provides = kodi=18.3rc1pre4
+	conflicts = kodi
 
 pkgname = kodi-devel-bin
 	pkgdesc = x11 kodi binary
@@ -137,6 +136,7 @@ pkgname = kodi-devel-bin
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
+	conflicts = kodi-bin
 
 pkgname = kodi-devel-wayland
 	pkgdesc = wayland kodi binary
@@ -161,7 +161,8 @@ pkgname = kodi-devel-wayland
 	depends = tinyxml
 	depends = waylandpp
 	depends = kodi-devel
-	provides = kodi-devel-bin
+	provides = kodi-devel-bin=18.3rc1pre4
+	conflicts = kodi-wayland
 
 pkgname = kodi-devel-gbm
 	pkgdesc = gbm kodi binary
@@ -186,7 +187,9 @@ pkgname = kodi-devel-gbm
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
-	provides = kodi-devel-bin
+	provides = kodi-devel-bin=18.3rc1pre4
+	provides = kodi-gbm
+	conflicts = kodi-gbm
 
 pkgname = kodi-devel-eventclients
 	pkgdesc = Kodi Event Clients
diff --git a/PKGBUILD b/PKGBUILD
index 114e7f9e69a4..70826aa3f8c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=(
 )
 pkgver=18.3rc1pre4
 _major=18.2
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -38,9 +38,9 @@ makedepends=(
   'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
   'upower' 'giflib' 'rapidjson' 'ghostscript' 'git'
   # wayland
-  'wayland-protocols' 'waylandpp' 'libxkbcommon'
+  'wayland-protocols' 'waylandpp'
   # gbm
-  'libinput'
+  'libinput' 'libxkbcommon'
 )
 
 _codename=Leia
@@ -199,6 +199,7 @@ build() {
   make
   make preinstall
 
+
   msg2 "building kodi-gbm"
   cd "$srcdir/kodi-build-gbm"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -243,9 +244,8 @@ package_kodi-devel() {
     'shairplay: AirPlay support'
     'upower: Display battery level'
   )
-  provides=('xbmc')
-  conflicts=('xbmc')
-  replaces=('xbmc')
+  provides=("kodi=${pkgver}")
+  conflicts=('kodi')
 
   _components=(
     'kodi'
@@ -274,6 +274,7 @@ package_kodi-devel() {
 
 package_kodi-devel-bin() {
   pkgdesc="x11 kodi binary"
+  conflicts=('kodi-bin')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr'
@@ -291,7 +292,8 @@ package_kodi-devel-bin() {
 
 package_kodi-devel-wayland() {
   pkgdesc="wayland kodi binary"
-  provides=('kodi-devel-bin')
+  provides=("kodi-devel-bin=${pkgver}")
+  conflicts=('kodi-wayland')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
@@ -308,7 +310,8 @@ package_kodi-devel-wayland() {
 
 package_kodi-devel-gbm() {
   pkgdesc="gbm kodi binary"
-  provides=('kodi-devel-bin')
+  provides=("kodi-devel-bin=${pkgver}" 'kodi-gbm')
+  conflicts=('kodi-gbm')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'