Add messengerfordesktop to conflicts

2 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff18d92c46d2..fe2f7a81af54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = messengerfordesktop-git
 	pkgdesc = Beautiful desktop client for Facebook Messenger. Sytten's fork
 	pkgver = v1.4.7
-	pkgrel = 3
+	pkgrel = 4
 	url = http://messengerfordesktop.com/
 	install = messengerfordesktop-git.install
 	arch = i686
@@ -21,6 +21,7 @@ pkgbase = messengerfordesktop-git
 	depends = nss
 	depends = xorg-xprop
 	depends = xorg-xwininfo
+	conflicts = messengerfordesktop
 	options = !strip
 	source = messengerfordesktop-git::git+https://github.com/Sytten/Facebook-Messenger-Desktop.git
 	source = start.sh
diff --git a/PKGBUILD b/PKGBUILD
index b4f7d4d82382..a6f69ed823e8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=messengerfordesktop-git
 pkgver=v1.4.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Beautiful desktop client for Facebook Messenger. Sytten's fork"
 arch=('i686' 'x86_64')
 url="http://messengerfordesktop.com/"
@@ -11,11 +11,12 @@ conflicts=("messengerfordesktop")
 options=(!strip)
 depends=('gcc-libs' 'cairo' 'libxtst' 'alsa-lib' 'gtk2' 'gconf' 'libnotify' 'fontconfig' 'nss' 'xorg-xprop' 'xorg-xwininfo')
 makedepends=('git' 'gulp' 'npm')
+install="$pkgname.install"
 source=("$pkgname::git+https://github.com/Sytten/Facebook-Messenger-Desktop.git"
-				"start.sh")
+		"start.sh")
+
 md5sums=('SKIP'
          'ce686652299792c01f4605cf995c4d87')
-install="$pkgname.install"
 
 if [ $(uname -m) == "i686" ]
  then
@@ -27,22 +28,22 @@ fi
 build() {
   cd $pkgname
   npm install
-  
+
   gulp build:${_arch}
 }
 
 package() {
-	install -D -m755 "${srcdir}/start.sh"	  "${pkgdir}/opt/MessengerForDesktop/start.sh"
-	
   cd "${srcdir}/messengerfordesktop-git/build/Messenger/${_arch}"
+
   mkdir -p "${pkgdir}/opt/MessengerForDesktop/"
+  install -D -m755 "${srcdir}/start.sh"	  "${pkgdir}/opt/MessengerForDesktop/start.sh"
   install -D -m755 "Messenger"    "${pkgdir}/opt/MessengerForDesktop/Messenger"
   install -D -m644 "nw.pak"       "${pkgdir}/opt/MessengerForDesktop/nw.pak"
   install -D -m644 "icudtl.dat"   "${pkgdir}/opt/MessengerForDesktop/icudtl.dat"
   install -D -m644 "libffmpegsumo.so"   "${pkgdir}/opt/MessengerForDesktop/libffmpegsumo.so"
 
   cd "${srcdir}/messengerfordesktop-git/assets-linux"
-	sed -i '6s/.*/Exec=sh \/opt\/MessengerForDesktop\/start.sh/' messengerfordesktop.desktop 
+  sed -i '6s/.*/Exec=sh \/opt\/MessengerForDesktop\/start.sh/' messengerfordesktop.desktop
   install -D -m644 "${srcdir}/messengerfordesktop-git/assets-linux/messengerfordesktop.desktop" "${pkgdir}/usr/share/applications/messengerfordesktop.desktop"
   install -D -m644 "icons/256/messengerfordesktop.png"     "${pkgdir}/usr/share/pixmaps/messengerfordesktop.png"
 }