Fixed typo and dependencies

3 files changed, 23 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fdaf04de80c..000ea835fcef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = session-desktop
 	pkgdesc = Private messaging from your desktop
 	pkgver = 1.0.4
-	pkgrel = 2
+	pkgrel = 4
 	url = https://getsession.org
 	install = session-desktop.install
 	arch = x86_64
 	license = GPL-3.0
-	depends = libnotify
-	depends = libappindicator-gtk3
 	depends = libxtst
 	depends = nss
 	depends = alsa-lib
 	depends = libxss
+	depends = libnotify
+	depends = xdg-utils
+	optdepends = libappindicator-gtk3: for tray support
 	conflicts = session-desktop-bin
-	source_x86_64 = https://github.com/loki-project/session-desktop/releases/download/v1.0.4/session-messenger-desktop-linux-amd64-1.0.4.deb
-	sha256sums_x86_64 = 792352d0862ecba075c785832a6dec7b9aa99e2da8a43de848bed6754d0f64e1
+	conflicts = session-desktop-git
+	conflicts = session-desktop-appimage
+	source = https://github.com/loki-project/session-desktop/releases/download/v1.0.4/session-messenger-desktop-linux-amd64-1.0.4.deb
+	sha256sums = 792352d0862ecba075c785832a6dec7b9aa99e2da8a43de848bed6754d0f64e1
 
 pkgname = session-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 199585824c12..4768cbb36cee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,16 @@
 
 pkgname=session-desktop
 pkgver=1.0.4
-pkgrel=2
+pkgrel=4
 pkgdesc="Private messaging from your desktop"
-arch=('x86_64')
+arch=(x86_64)
 license=('GPL-3.0')
 url="https://getsession.org"
-conflicts=("session-desktop-bin")
-
-source=()
-sha256sums_x86_64=("792352d0862ecba075c785832a6dec7b9aa99e2da8a43de848bed6754d0f64e1")
-source_x86_64=("https://github.com/loki-project/session-desktop/releases/download/v${pkgver}/session-messenger-desktop-linux-amd64-${pkgver}.deb")
-
-depends=("libnotify" "libappindicator-gtk3" "libxtst" "nss" "alsa-lib" "libxss")
-
+conflicts=(session-desktop-bin session-desktop-git session-desktop-appimage)
+source=("https://github.com/loki-project/session-desktop/releases/download/v${pkgver}/session-messenger-desktop-linux-amd64-${pkgver}.deb")
+sha256sums=("792352d0862ecba075c785832a6dec7b9aa99e2da8a43de848bed6754d0f64e1")
+depends=(libxtst nss alsa-lib libxss libnotify xdg-utils)
+optdepends=('libappindicator-gtk3: for tray support')
 install=${pkgname}.install
 
 package() {
diff --git a/session-desktop.install b/session-desktop.install
index b32944659668..282b36d6f077 100644
--- a/session-desktop.install
+++ b/session-desktop.install
@@ -1,23 +1,15 @@
 post_install() {
-	sudo ln -sf /opt/Session/session-messenger-desktop /usr/bin/session-messenger-desktop
-}
-
-post_remove() {
-	sudo rm /usr/bin/session-messenger-desktop
-}
-
-post_install() {
-        gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-        ln -sf '/opt/Session/session-messenger-desktop' '/usr/bin/session-messenger-desktop'
-        update-desktop-database -q
+    sudo ln -sf /opt/Session/session-messenger-desktop /usr/bin/session-messenger-desktop
+    sudo update-mime-database /usr/share/mime
+    sudo update-desktop-database /usr/share/applications
 }
 
 post_upgrade() {
-        post_install
+    post_install
 }
 
 post_remove() {
-        gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-        rm -f '/usr/bin/session-messenger-desktop'
-        update-desktop-database -q
-}
+    sudo rm -f '/usr/bin/session-messenger-desktop'
+    sudo update-mime-database /usr/share/mime
+    sudo update-desktop-database /usr/share/applications
+}}