Overhaul

3 files changed, 41 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f38d63dca2ac..8c1d30684641 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,26 @@
 pkgbase = zulip-desktop-bin
-	pkgdesc = Zulip Desktop Client - Workplace chat that improves your productivity.
+	pkgdesc = Real-time team chat based on the email threading model (bin)
 	pkgver = 4.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://zulipchat.com
 	arch = x86_64
 	license = Apache
-	provides = zulip-desktop=4.0.0
+	makedepends = unzip
+	depends = libxkbfile
+	depends = gtk3
+	depends = libxss
+	depends = nss
+	provides = zulip-desktop
 	conflicts = zulip-desktop
+	noextract = Zulip-4.0.0-linux-x64.zip
 	source = https://github.com/zulip/zulip-desktop/releases/download/v4.0.0/Zulip-4.0.0-linux-x64.zip
 	source = zulip.desktop
-	sha256sums = c9c4f75871cf2fb88a22d68112e06300bb45bac75a06bf4d0af0ccfc530a756c
-	sha256sums = 4cf97c330c440c5f3d0cdc3bd9af9b22a0475dd462bbe336d591d52b5bb6236e
+	source = https://github.com/zulip/zulip-desktop/blob/v4.0.0/build/zulip.png
+	source = https://github.com/zulip/zulip-desktop/blob/v4.0.0/LICENSE
+	sha512sums = 4bbed4d0b781e2964dee51e6ea313c6e6b74d1e6cc47aad70d3a4f127bbde5d4462a19355ed49f4026c0904d38927a37f691fc962a0fa6971c6bd6e878d51f9d
+	sha512sums = 7696a6874d17957f99452452723ae1a6b32b6814b018361a71ed1fe0191e1c6da6f3ad693e2e279615e74f687c380ff2f6dab8b69fcd82476e8f33b56a6b4cb5
+	sha512sums = 1839542bec928c14e9de4b4cb5e986767983f0b8ce51429d718eabdd459b7865abfd7793555fb8727642b3a4ff77d787e5f07370040025b3bc0c8a7b883cf052
+	sha512sums = e8da9afa03d2b8feabef60f49df30d4dfe95654aa7172d62c6121985b715a71a92e5e65e4c03fc87d1c6269c1c83f610bc77999c935c026144b16e348300ea77
 
 pkgname = zulip-desktop-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 9809f407b1d1..3abfda292b2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,40 @@
 # Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch>
+# Maintainer: Jean Lucas <jean@4ray.co>
 # Contributor: kaptoxic <kaptoxic at yahoo dot com>
 # Contributor: Matthew Avant <matthew dot avant at gmail dot com>
 # Contributor: Rose Ames <rose at happyspork dot com>
 
 pkgname=zulip-desktop-bin
 pkgver=4.0.0
-pkgrel=1
-pkgdesc="Zulip Desktop Client - Workplace chat that improves your productivity."
-url="https://zulipchat.com"
+pkgrel=2
+pkgdesc='Real-time team chat based on the email threading model (bin)'
 arch=(x86_64)
+url=https://zulipchat.com
 license=(Apache)
-source=("https://github.com/zulip/zulip-desktop/releases/download/v$pkgver/Zulip-$pkgver-linux-x64.zip"
-        zulip.desktop)
-sha256sums=('c9c4f75871cf2fb88a22d68112e06300bb45bac75a06bf4d0af0ccfc530a756c'
-            '4cf97c330c440c5f3d0cdc3bd9af9b22a0475dd462bbe336d591d52b5bb6236e')
-provides=("zulip-desktop=$pkgver")
+depends=(libxkbfile gtk3 libxss nss)
+makedepends=(unzip)
+provides=(zulip-desktop)
 conflicts=(zulip-desktop)
-
-prepare() {
-  # Remove symlink to source archive
-  rm -f "$(basename "${source[0]}")"
-}
+source=(https://github.com/zulip/zulip-desktop/releases/download/v$pkgver/Zulip-$pkgver-linux-x64.zip
+        zulip.desktop
+        https://github.com/zulip/zulip-desktop/blob/v$pkgver/build/zulip.png
+        https://github.com/zulip/zulip-desktop/blob/v$pkgver/LICENSE)
+noextract=(Zulip-$pkgver-linux-x64.zip)
+sha512sums=('4bbed4d0b781e2964dee51e6ea313c6e6b74d1e6cc47aad70d3a4f127bbde5d4462a19355ed49f4026c0904d38927a37f691fc962a0fa6971c6bd6e878d51f9d'
+            '7696a6874d17957f99452452723ae1a6b32b6814b018361a71ed1fe0191e1c6da6f3ad693e2e279615e74f687c380ff2f6dab8b69fcd82476e8f33b56a6b4cb5'
+            '1839542bec928c14e9de4b4cb5e986767983f0b8ce51429d718eabdd459b7865abfd7793555fb8727642b3a4ff77d787e5f07370040025b3bc0c8a7b883cf052'
+            'e8da9afa03d2b8feabef60f49df30d4dfe95654aa7172d62c6121985b715a71a92e5e65e4c03fc87d1c6269c1c83f610bc77999c935c026144b16e348300ea77')
 
 package() {
-  install -Dm 644 zulip.desktop -t "$pkgdir"/usr/share/applications/
-  rm zulip.desktop
-
-  # Install the whole archive in that folder
-  install -dm755 "$pkgdir"/usr/lib/zulip-desktop
-  mv * "$pkgdir"/usr/lib/zulip-desktop/
+  _dest="$pkgdir"/usr/lib/zulip-desktop
+  mkdir -p $_dest
+  unzip -d $_dest Zulip-$pkgver-linux-x64.zip
 
-  # Symlink for ease of use
-  install -dm755 "$pkgdir"/usr/bin
+  mkdir "$pkgdir"/usr/bin
   ln -s /usr/lib/zulip-desktop/zulip "$pkgdir"/usr/bin/zulip
+
+  install -Dm 644 zulip.desktop -t "$pkgdir"/usr/share/applications
+  install -Dm 644 zulip.png -t "$pkgdir"/usr/share/pixmaps
+
+  install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/zulip-desktop
 }
diff --git a/zulip.desktop b/zulip.desktop
index fb5f18bc784d..4768ad88eaf6 100644
--- a/zulip.desktop
+++ b/zulip.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Version=1.0
 Type=Application
 Name=Zulip
 Comment=Real-time team chat based on the email threading model