using -next suffix and avoid conflict with openbazaar package

4 files changed, 13 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccf5e0609bb5..1f76d209305b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Aug 26 01:40:51 UTC 2016
+# Fri Aug 26 01:49:20 UTC 2016
 pkgbase = openbazaar-git
 	pkgdesc = Front-end Electron application for talking with the OpenBazaar daemon
 	pkgver = 338.88adef7
@@ -12,15 +12,13 @@ pkgbase = openbazaar-git
 	makedepends = npm
 	makedepends = asar
 	depends = electron
-	provides = openbazaar
-	conflicts = openbazaar
 	options = !strip
 	source = openbazaar::git+https://github.com/OpenBazaar/openbazaar-desktop.git
 	source = openbazaar.sh
 	source = openbazaar.desktop
 	md5sums = SKIP
-	md5sums = 978f2bc37d379c6ccd8c5942ef44612c
-	md5sums = dbca9273e9fc18a7aa5d1c395508fe60
+	md5sums = 33bdb461a15ea719be2bf41caa9d72d5
+	md5sums = d7394c8c503c5c930a7d3ceb005a2d3d
 
 pkgname = openbazaar-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ddd302fceb4..c6c8755acb56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,6 @@ source=(
 )
 install=${_pkgname}.install
 options=('!strip')
-provides=('openbazaar')
-conflicts=('openbazaar')
 
 build(){
   cd $srcdir/${_pkgname}
@@ -27,21 +25,21 @@ build(){
   npm run build
   rm -rf {.git*,.eslint*,.travis*}
   npm prune --production
-  asar pack ../${_pkgname} ../${_pkgname}.asar
+  asar pack ../${_pkgname} ../${_pkgname}-next.asar
 }
 
 package(){
 
 msg2 "Installing Openbazaar data"
   install -dm755 $pkgdir/opt/
-  cp -r $srcdir/${_pkgname}.asar $pkgdir/opt/
+  cp -r $srcdir/${_pkgname}-next.asar $pkgdir/opt/
 
 msg2 "Installing execution script"
-  install -Dm755 $srcdir/${_pkgname}.sh $pkgdir/usr/bin/${_pkgname}
+  install -Dm755 $srcdir/${_pkgname}.sh $pkgdir/usr/bin/${_pkgname}-next
 
 msg2 "Installing icons and desktop menu entry"
-  install -Dm644 $srcdir/${_pkgname}/imgs/icon.png "$pkgdir"/usr/share/pixmaps/openbazaar.png
-  install -Dm644 $srcdir/${_pkgname}.desktop "$pkgdir"/usr/share/applications/openbazaar.desktop
+  install -Dm644 $srcdir/${_pkgname}/imgs/icon.png "$pkgdir"/usr/share/pixmaps/${_pkgname}-next.png
+  install -Dm644 $srcdir/${_pkgname}.desktop "$pkgdir"/usr/share/applications/${_pkgname}-next.desktop
 }
 
 pkgver() {
@@ -50,5 +48,5 @@ pkgver() {
 }
 
 md5sums=('SKIP'
-         '978f2bc37d379c6ccd8c5942ef44612c'
-         'dbca9273e9fc18a7aa5d1c395508fe60')
+         '33bdb461a15ea719be2bf41caa9d72d5'
+         'd7394c8c503c5c930a7d3ceb005a2d3d')
diff --git a/openbazaar.desktop b/openbazaar.desktop
index 3bc0b1906747..a0db1f30fdd2 100644
--- a/openbazaar.desktop
+++ b/openbazaar.desktop
@@ -2,8 +2,8 @@
 Name=OpenBazaar
 GenericName=Decentralized marketplace for trading with anyone using Bitcoin.
 Comment=OpenBazaar is an open source project to create a decentralized network for commerce online—using Bitcoin—that has no fees and cannot be censored.
-Exec=/usr/bin/openbazaar %U
-Icon=openbazaar
+Exec=/usr/bin/openbazaar-next %U
+Icon=openbazaar-next
 Terminal=false
 Type=Application
 Categories=Application;Network;
diff --git a/openbazaar.sh b/openbazaar.sh
index e2f63b7861e0..39d7eac742b6 100644
--- a/openbazaar.sh
+++ b/openbazaar.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /opt/
-electron openbazaar.asar "$@"
+electron openbazaar-next.asar "$@"