Update 1:r5.20140913.1a0b52a-2

2 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ce16119e023..3957f34f19ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sunxi-livesuite-git
 	pkgver = r5.20140913.1a0b52a
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/linux-sunxi/sunxi-livesuite
 	arch = x86_64
@@ -8,9 +8,6 @@ pkgbase = sunxi-livesuite-git
 	groups = sunxi-livesuite-git
 	license = GPLv2
 	makedepends = git
-	provides = sunxi-livesuite-dkms
-	conflicts = sunxi-livesuite-git
-	conflicts = sunxi-livesuite
 	options = !strip
 	source = sunxi-livesuite::git+https://github.com/linux-sunxi/sunxi-livesuite.git
 	source = git+https://github.com/M0Rf30/sunxi-awusb.git
@@ -21,11 +18,15 @@ pkgname = sunxi-livesuite-git
 	pkgdesc = LiveSuit is a tool to flash Images to the NAND of Allwinner devices.
 	depends = sunxi-livesuite-dkms-git
 	depends = libpng12
+	provides = sunxi-livesuite
+	conflicts = sunxi-livesuite
 
 pkgname = sunxi-livesuite-dkms-git
 	pkgdesc = DKMS module for Allwinner devices
 	url = https://github.com/M0Rf30/sunxi-awusb
 	depends = dkms
+	provides = sunxi-livesuite-dkms
+	conflicts = sunxi-livesuite-dkms
 	conflicts = sunxi-awusb-dkms
 	replaces = sunxi-livesuite-git-dkms
 	replaces = sunxi-awusb-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 747e2c427551..edeabc0f944e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,10 @@ pkgbase=sunxi-livesuite-git
 pkgname=($pkgbase sunxi-livesuite-dkms-git)
 epoch=1
 pkgver=r5.20140913.1a0b52a
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686')
 url="https://github.com/linux-sunxi/sunxi-livesuite"
 license=('GPLv2')
-provides=('sunxi-livesuite-dkms')
-conflicts=(${pkgbase} ${pkgbase%-git})
 #replaces=(${pkgname})
 makedepends=('git')
 backup=()
@@ -39,6 +37,8 @@ pkgver() {
 package_sunxi-livesuite-git() {
     pkgdesc="LiveSuit is a tool to flash Images to the NAND of Allwinner devices."
     depends=('sunxi-livesuite-dkms-git' 'libpng12')
+    provides=(${pkgname%-git})
+    conflicts=(${pkgname%-git})
 
     install -dm0755 "${pkgdir}/opt/sunxi/${pkgbase%-git}"
     cp -r "${srcdir}/${pkgbase%-git}/x86" "${pkgdir}/opt/sunxi/${pkgbase%-git}"
@@ -72,7 +72,8 @@ package_sunxi-livesuite-dkms-git() {
     pkgdesc="DKMS module for Allwinner devices"
     url="https://github.com/M0Rf30/sunxi-awusb"
     depends=('dkms')
-    conflicts=('sunxi-awusb-dkms')
+    provides=(${pkgname%-git})
+    conflicts=(${pkgname%-git} sunxi-awusb-dkms)
     replaces=('sunxi-livesuite-git-dkms' 'sunxi-awusb-dkms')
     cd "${srcdir}/sunxi-awusb/"
     install -Dt "${pkgdir}/usr/src/${pkgname}" -m644 awusb.c Makefile dkms.conf