upgpkg: telegram-desktop-bin 0.9.44-2

Major clean-up, done thanks to namcap

5 files changed, 17 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad9bba2cdb8f..a35f757cf312 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,24 @@
 # Generated by mksrcinfo v8
-# Thu Apr 21 18:09:40 UTC 2016
+# Mon May  2 09:35:26 UTC 2016
 pkgbase = telegram-desktop-bin
 	pkgdesc = Official desktop version of Telegram messaging app - Static binaries
 	pkgver = 0.9.44
-	pkgrel = 1
+	pkgrel = 2
 	url = https://desktop.telegram.org
-	install = telegram-desktop-bin.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	depends = glib2
 	depends = libx11
-	depends = libgcrypt
-	depends = libasyncns
-	depends = libsndfile
-	depends = libsystemd
-	depends = libdbus
-	depends = openal
-	depends = libogg
-	depends = opus
-	depends = opusfile
-	depends = portaudio
-	depends = openssl
-	depends = zlib
-	depends = libexif
-	depends = xz
 	optdepends = libappindicator-gtk2: to hide Telegram in the tray bar (GTK2-based desktop environment)
 	optdepends = libappindicator-gtk3: to hide Telegram in the tray bar (GTK3-based desktop environment)
 	optdepends = libappindicator-sharp: to hide Telegram in the tray bar (Unity-based desktop environment)
 	provides = telegram-desktop
 	conflicts = telegram-desktop
 	replaces = telegram-bin
-	source = telegram-desktop-bin.sh
 	source = telegram-desktop-bin.desktop
 	source = telegram-desktop-bin.png
-	sha256sums = 0f2a6e4c2b9b4ff5f4ddb628728be4cc5a419f79695c0151321a5f234099ee59
-	sha256sums = e3e10fe8620bd4ed8fda41743ad844739757286eeecea5249cf1fcf21a8431bd
+	sha256sums = 32d1597d67a7ef519367e499fcc978da4cce104e370b3787853446d93b1533d6
 	sha256sums = 4226167b476a75e844ddf0d429068e7e901bbde516810a7d4ca90f8405c01eef
 	source_i686 = https://updates.tdesktop.com/tlinux32/tsetup32.0.9.44.tar.xz
 	sha256sums_i686 = 6af4e802a59874c504b8a504b7b1c5f71454b5537e9955c0ab17f8af7882bbb1
diff --git a/PKGBUILD b/PKGBUILD
index 3002931904fe..647b9bec8e01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,15 @@
 
 pkgname=telegram-desktop-bin
 pkgver=0.9.44
-pkgrel=1
+pkgrel=2
 pkgdesc="Official desktop version of Telegram messaging app - Static binaries"
 arch=('i686' 'x86_64')
 url="https://desktop.telegram.org"
 license=('GPL3')
-depends=('libx11' 'libgcrypt' 'libasyncns' 'libsndfile' 'libsystemd' 'libdbus' 'openal' 'libogg' 'opus' 'opusfile' 'portaudio' 'openssl' 'zlib' 'libexif' 'xz')
+depends=(
+	'glib2'
+	'libx11'
+)
 optdepends=(
 			'libappindicator-gtk2: to hide Telegram in the tray bar (GTK2-based desktop environment)'
 			'libappindicator-gtk3: to hide Telegram in the tray bar (GTK3-based desktop environment)'
@@ -18,15 +21,16 @@ optdepends=(
 conflicts=('telegram-desktop')
 provides=('telegram-desktop')
 replaces=('telegram-bin')
-install="$pkgname.install"
 
 # Sources
-source=("$pkgname.sh" "$pkgname.desktop" "$pkgname.png")
+source=(
+	"$pkgname.desktop"
+	"$pkgname.png"
+)
 source_i686=('https://updates.tdesktop.com/tlinux32/tsetup32.'$pkgver'.tar.xz')
 source_x86_64=('https://updates.tdesktop.com/tlinux/tsetup.'$pkgver'.tar.xz')
 # Checksums
-sha256sums=('0f2a6e4c2b9b4ff5f4ddb628728be4cc5a419f79695c0151321a5f234099ee59'
-            'e3e10fe8620bd4ed8fda41743ad844739757286eeecea5249cf1fcf21a8431bd'
+sha256sums=('32d1597d67a7ef519367e499fcc978da4cce104e370b3787853446d93b1533d6'
             '4226167b476a75e844ddf0d429068e7e901bbde516810a7d4ca90f8405c01eef')
 sha256sums_i686=('6af4e802a59874c504b8a504b7b1c5f71454b5537e9955c0ab17f8af7882bbb1')
 sha256sums_x86_64=('866acd224c04f3a51bff8b347a49d902f536a93214a8a9658fb7746aa3ddba5d')
@@ -36,17 +40,12 @@ package() {
 	cd "$srcdir/"
 
 	# Creating needed directories
-	install -dm755 "$pkgdir/opt/telegram/"
 	install -dm755 "$pkgdir/usr/bin"
 	install -dm755 "$pkgdir/usr/share/pixmaps/"
 	install -dm755 "$pkgdir/usr/share/applications/"
 
 	# Program
-	install -Dm755 "$srcdir/Telegram/Telegram" "$pkgdir/opt/telegram/"
-	install -Dm755 "$srcdir/Telegram/Updater" "$pkgdir/opt/telegram/"
-
-	# Shell wrapper
-	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/telegram"
+	install -Dm755 "$srcdir/Telegram/Telegram" "$pkgdir/usr/bin/telegram-desktop"
 
 	# Desktop launcher
 	install -Dm755 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/telegram.png"
diff --git a/telegram-desktop-bin.desktop b/telegram-desktop-bin.desktop
index ea114b22037a..775a8b824c09 100644
--- a/telegram-desktop-bin.desktop
+++ b/telegram-desktop-bin.desktop
@@ -3,8 +3,8 @@ Encoding=UTF-8
 Version=1.0
 Name=Telegram Desktop
 Comment=Official desktop version of Telegram messaging app
-Exec=telegram -- %u
-StartupWMClass=Telegram
+Exec=telegram-desktop -- %u
+StartupWMClass=telegram-desktop
 Icon=telegram
 Terminal=false
 Type=Application
diff --git a/telegram-desktop-bin.install b/telegram-desktop-bin.install
deleted file mode 100644
index c490916fff54..000000000000
--- a/telegram-desktop-bin.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	[ ! -z `which update-desktop-database` ]&& update-desktop-database -q
-	echo "Remember to delete the official (non-tweaked) launcher by using:"
-	echo ""rm ~/.local/share/applications/telegramdesktop.desktop""
-	echo "After running Telegram Desktop"
-}
-
-post_remove()
-{
-	echo "You can remove old data from a terminl doing:"
-	echo "rm -r ~/.TelegramDesktop"
-}
diff --git a/telegram-desktop-bin.sh b/telegram-desktop-bin.sh
deleted file mode 100644
index 86fc5894b36b..000000000000
--- a/telegram-desktop-bin.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/telegram/Telegram $@