New version from a contribution by FadeMind :-)

3 files changed, 34 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9c2c817fb88..b4c0e527eb8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,26 @@
 pkgbase = franz
 	pkgdesc = A free messaging app for WhatsApp, Facebook Messenger, Telegram, Slack and more.
 	pkgver = 0.9.10
-	pkgrel = 3
+	pkgrel = 4
 	url = http://meetfranz.com/
 	arch = i686
 	arch = x86_64
 	license = custom:github
+	makedepends = tar
+	depends = alsa-lib
+	depends = bash
+	depends = desktop-file-utils
 	depends = gconf
+	depends = gtk2
+	depends = libnotify
+	depends = libxtst
+	depends = nss
+	noextract = Franz-linux-x64-0.9.10
 	source = franz.sh
 	source = franz.desktop
 	source = franz.png
 	sha256sums = 5d53c349bcf0452a31e3aee609eac6809f26750f4fb4da049132adc5c9a40289
-	sha256sums = 331918823545ad2696a7fb1c8650f1d001be6dfe40f09dd430dee0e4e3f34594
+	sha256sums = c63052b7ada73dbc984f55afc6d0ad937bf57ae5b0b41b560ef46937afeb81c5
 	sha256sums = 6e761371afadf155b8bc25e94fd7de371c16130a87338300e5800924916a7a28
 	source_i686 = https://github.com/imprecision/franz-app/releases/download/2.0/Franz-linux-ia32-0.9.10.tgz
 	sha256sums_i686 = 9a4ca6e06339b4a01f644fd081b0c1bb8eb3a4e5b8dc8e1c65e09e667b2547c9
diff --git a/PKGBUILD b/PKGBUILD
index 8346f29f625e..461ca8369980 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,50 +3,34 @@
 pkgname=franz
 pkgver=0.9.10
 _gittag=2.0
-pkgrel=3
-pkgdesc="A free messaging app for WhatsApp, Facebook Messenger, Telegram, Slack and more."
+pkgrel=4
+pkgdesc='A free messaging app for WhatsApp, Facebook Messenger, Telegram, Slack and more.'
 arch=('i686' 'x86_64')
-depends=('gconf')
-url="http://meetfranz.com/"
-license=("custom:github")
-
-#Sources
-source=("$pkgname.sh" "$pkgname.desktop" "$pkgname.png")
-source_i686=('https://github.com/imprecision/franz-app/releases/download/'$_gittag'/Franz-linux-ia32-'$pkgver'.tgz')
-source_x86_64=('https://github.com/imprecision/franz-app/releases/download/'$_gittag'/Franz-linux-x64-'$pkgver'.tgz')
-#Checksums
+depends=('alsa-lib' 'bash' 'desktop-file-utils' 'gconf' 'gtk2' 'libnotify' 'libxtst' 'nss')
+makedepends=('tar')
+url='http://meetfranz.com/'
+license=('custom:github')
+source=("${pkgname}.sh" "${pkgname}.desktop" "${pkgname}.png")
+source_i686=("https://github.com/imprecision/franz-app/releases/download/$_gittag/Franz-linux-ia32-$pkgver.tgz")
+source_x86_64=("https://github.com/imprecision/franz-app/releases/download/$_gittag/Franz-linux-x64-$pkgver.tgz")
 sha256sums=('5d53c349bcf0452a31e3aee609eac6809f26750f4fb4da049132adc5c9a40289'
-            '331918823545ad2696a7fb1c8650f1d001be6dfe40f09dd430dee0e4e3f34594'
+            'c63052b7ada73dbc984f55afc6d0ad937bf57ae5b0b41b560ef46937afeb81c5'
             '6e761371afadf155b8bc25e94fd7de371c16130a87338300e5800924916a7a28')
 sha256sums_i686=('9a4ca6e06339b4a01f644fd081b0c1bb8eb3a4e5b8dc8e1c65e09e667b2547c9')
 sha256sums_x86_64=('3bcd64f01ddd2f5bd723d3fd04524eddc3fd11a3c53c95acc0029bb46d11042a')
+[[ "$CARCH" = "i686" ]] && _path="Franz-linux-ia32-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _path="Franz-linux-x64-${pkgver}"
+noextract=(${_path})
 
-package() {
-
-	cd "$srcdir/"
-
-	# Creating needed directories
-	install -dm755 "$pkgdir/opt/franz/"
-	install -dm755 "$pkgdir/usr/bin"
-	install -dm755 "$pkgdir/usr/share/pixmaps/"
-	install -dm755 "$pkgdir/usr/share/applications/"
-
-  # Program
-	cp -r "$srcdir/locales" "$pkgdir/opt/franz/"
-	cp -r "$srcdir/resources" "$pkgdir/opt/franz"
-	install -Dm644 "$srcdir/content_shell.pak" "$pkgdir/opt/franz/"
-	install -Dm755 "$srcdir/Franz" "$pkgdir/opt/franz/"
-	install -Dm644 "$srcdir/icudtl.dat" "$pkgdir/opt/franz/"
-	install -Dm644 "$srcdir/libffmpeg.so" "$pkgdir/opt/franz/"
-	install -Dm644 "$srcdir/libgcrypt.so.11" "$pkgdir/opt/franz/"
-	install -Dm755 "$srcdir/libnode.so" "$pkgdir/opt/franz/"
-	install -Dm644 "$srcdir/natives_blob.bin" "$pkgdir/opt/franz/"
-	install -Dm644 "$srcdir/snapshot_blob.bin" "$pkgdir/opt/franz/"
-
-	# Shell wrapper
-	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/franz"
+prepare() {
+    install -d ${srcdir}/${_path}/
+    tar xf "${srcdir}/${_path}.tgz" -C "${srcdir}/${_path}"
+}
 
-	# Desktop launcher
-	install -Dm755 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/franz.png"
-	install -Dm755 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/franz.desktop"
+package() {
+    install -d ${pkgdir}/{opt/franz,usr/{bin,share/pixmaps}}
+    cp -R ${srcdir}/${_path}/* ${pkgdir}/opt/${pkgname}/
+    install -Dm755 $srcdir/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
+    install -Dm644 $srcdir/${pkgname}.png ${pkgdir}/usr/share/pixmaps/franz.png
+    desktop-file-install ${srcdir}/${pkgname}.desktop --dir ${pkgdir}/usr/share/applications/
 }
diff --git a/franz.desktop b/franz.desktop
index 5dc966d2254a..82c4ef704b70 100644
--- a/franz.desktop
+++ b/franz.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=0.9.9
 Name=Franz
 Comment=A free messaging app for WhatsApp, Facebook Messenger, Telegram, Slack and more.
 Exec=franz -- %u