upgpkg: 4.36.140-1

3 files changed, 24 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d42380f7fd8..ff8ad24c3895 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = slack-electron
 	pkgdesc = Slack Desktop (Beta) for Linux, using the system Electron package
-	pkgver = 4.36.138
+	pkgver = 4.36.140
 	pkgrel = 1
 	url = https://slack.com/downloads/linux
 	arch = x86_64
-	license = custom:proprietary
+	license = LicenseRef-SlackProprietary
 	depends = electron
 	depends = gcc-libs
 	depends = glibc
@@ -13,10 +13,10 @@ pkgbase = slack-electron
 	optdepends = libappindicator-gtk3: for notification indicator in the status bar on GNOME
 	provides = slack-desktop
 	conflicts = slack-desktop
-	noextract = slack-electron-4.36.138.deb
-	source = slack-electron-4.36.138.deb::https://downloads.slack-edge.com/releases/linux/4.36.138/prod/x64/slack-desktop-4.36.138-amd64.deb
+	noextract = slack-electron-4.36.140.deb
+	source = slack-electron-4.36.140.deb::https://downloads.slack-edge.com/releases/linux/4.36.140/prod/x64/slack-desktop-4.36.140-amd64.deb
 	source = slack.sh
-	sha256sums = 4f5b1eb378d5a58a364f9dc70df5c0ccd9be0cedbab42df7193ddfbb1d2a021a
-	sha256sums = 4db11d083626a561129ca40e9cce7cc613c42223f138bb0136c62064c57471fd
+	sha256sums = b90f363faf735987231b653756d7bffa0e5e328e6254551d6cbd85c52e84507d
+	sha256sums = 7d3b40e668f27cc94eeb3789f4e6d30601946c3b475ab718d01a7008919357b8
 
 pkgname = slack-electron
diff --git a/PKGBUILD b/PKGBUILD
index 6f08e7646ad8..403f391856c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
 # Contributor: Yurii Kolesnykov <root@yurikoles.com>
 
 pkgname=slack-electron
-pkgver=4.36.138
+pkgver=4.36.140
 pkgrel=1
 pkgdesc="Slack Desktop (Beta) for Linux, using the system Electron package"
 arch=(x86_64)
 url="https://slack.com/downloads/linux"
-license=(custom:proprietary)
+license=(LicenseRef-SlackProprietary)
 depends=(
   electron
   gcc-libs
@@ -20,15 +20,14 @@ depends=(
 optdepends=('libappindicator-gtk3: for notification indicator in the status bar on GNOME')
 provides=(slack-desktop)
 conflicts=(slack-desktop)
-
 source=(
   "$pkgname-$pkgver.deb::https://downloads.slack-edge.com/releases/linux/$pkgver/prod/x64/slack-desktop-$pkgver-amd64.deb"
   "slack.sh"
 )
 noextract=("$pkgname-$pkgver.deb")
 sha256sums=(
-  '4f5b1eb378d5a58a364f9dc70df5c0ccd9be0cedbab42df7193ddfbb1d2a021a'
-  '4db11d083626a561129ca40e9cce7cc613c42223f138bb0136c62064c57471fd'
+  'b90f363faf735987231b653756d7bffa0e5e328e6254551d6cbd85c52e84507d'
+  '7d3b40e668f27cc94eeb3789f4e6d30601946c3b475ab718d01a7008919357b8'
 )
 
 _archive="$pkgname-$pkgver"
@@ -55,8 +54,19 @@ prepare() {
 package() {
   cd "$_archive"
 
-  install -dm755 "$pkgdir/usr/lib/slack/"
-  cp --archive --no-preserve=ownership usr/lib/slack/resources/* "$pkgdir/usr/lib/slack/"
+  install -dm755 "$pkgdir/usr/lib/slack/resources/"
+  cp --archive -t "$pkgdir/usr/lib/slack/resources/" \
+    usr/lib/slack/resources/*
+
+  install -dm755 "$pkgdir/usr/lib/slack/locales/"
+  cp --archive -t "$pkgdir/usr/lib/slack/locales/" \
+    usr/lib/slack/locales/*
+
+  install -Dm644 -t "$pkgdir/usr/lib/slack" \
+    usr/lib/slack/LICENSE \
+    usr/lib/slack/LICENSES-linux.json \
+    usr/lib/slack/resources.pak \
+    usr/lib/slack/version
 
   install -Dm755 "$srcdir/slack.sh" "$pkgdir/usr/bin/slack"
 
diff --git a/slack.sh b/slack.sh
index 083824f48b25..3e3cbddb9d19 100644
--- a/slack.sh
+++ b/slack.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec electron /usr/lib/slack/app.asar "$@"
+exec electron /usr/lib/slack/resources/app.asar "$@"