alarm/kodi-rbp to 14.2-2

alarm/kodi-rbp/PKGBUILD

@@ -11,7 +11,7 @@ pkgbase=kodi-rbp
 pkgname=('kodi-rbp' 'kodi-rbp-eventclients')
 pkgver=14.2
 _codename=Helix
-pkgrel=1
+pkgrel=2
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
 arch=('armv6h' 'armv7h')
 url="http://kodi.tv"
@@ -121,7 +121,7 @@ package_kodi-rbp() {
 
   install="kodi.install"
   provides=('xbmc' 'kodi')
-  conflicts=('xbmc' 'kodi' 'shairplay-git')
+  conflicts=('xbmc' 'kodi' 'shairplay-git' 'arm-mem-git')
   replaces=('xbmc-rbp')
 
   cd "$srcdir/xbmc-$pkgver-$_codename"