Some reworks for the PKGBUILD + a tweaked desktop file

6 files changed, 37 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 311c47cb210b..2b9a21d30ca2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-bin
 	pkgdesc = Official desktop version of Telegram messaging app.
 	pkgver = 0.8.38
-	pkgrel = 2
+	pkgrel = 3
 	url = https://desktop.telegram.org
 	install = telegram-desktop-bin.install
 	arch = i686
@@ -22,10 +22,15 @@ pkgbase = telegram-desktop-bin
 	depends = zlib
 	depends = libexif
 	depends = xz
-	conflicts = telegram-dev
+	provides = telegram-desktop
+	conflicts = telegram-desktop
 	replaces = telegram-bin
-	source = telegram
+	source = telegram-desktop-bin.sh
+	source = telegram-desktop-bin.desktop
+	source = telegram-desktop-bin.png
 	sha256sums = 0f2a6e4c2b9b4ff5f4ddb628728be4cc5a419f79695c0151321a5f234099ee59
+	sha256sums = 338b1bb46b786e2030883657b96791523a05ddf5ad5ac3d60056dc8e2e803c91
+	sha256sums = 4226167b476a75e844ddf0d429068e7e901bbde516810a7d4ca90f8405c01eef
 	source_i686 = https://updates.tdesktop.com/tlinux32/tsetup32.0.8.38.tar.xz
 	sha256sums_i686 = 1cd1337c5e7cdf235bae06f14d51fd5b9ef17f0bba424258d31c111f1f70d836
 	source_x86_64 = https://updates.tdesktop.com/tlinux/tsetup.0.8.38.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 1db8bf0a7910..0f7c011b74db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,22 +4,25 @@
 
 pkgname=telegram-desktop-bin
 pkgver=0.8.38
-pkgrel=2
+pkgrel=3
 pkgdesc="Official desktop version of Telegram messaging app."
 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')
-conflicts=('telegram-dev')
+conflicts=('telegram-desktop')
+provides=('telegram-desktop')
 replaces=('telegram-bin')
 install="$pkgname.install"
 
 # Sources
-source=('telegram')
+source=("$pkgname.sh" "$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')
+sha256sums=('0f2a6e4c2b9b4ff5f4ddb628728be4cc5a419f79695c0151321a5f234099ee59'
+            '338b1bb46b786e2030883657b96791523a05ddf5ad5ac3d60056dc8e2e803c91'
+            '4226167b476a75e844ddf0d429068e7e901bbde516810a7d4ca90f8405c01eef')
 sha256sums_i686=('1cd1337c5e7cdf235bae06f14d51fd5b9ef17f0bba424258d31c111f1f70d836')
 sha256sums_x86_64=('5b7b15ab555275beda47a198c34baee97cfadc3d88feb664a01aa342ad603ba0')
 
@@ -27,15 +30,20 @@ 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/telegram" "$pkgdir/usr/bin"
+	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/telegram"
 
+	# Desktop launcher
+	install -Dm755 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/telegram.png"
+	install -Dm755 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/telegram.desktop"
 }
-
diff --git a/telegram-desktop-bin.desktop b/telegram-desktop-bin.desktop
new file mode 100644
index 000000000000..817cf0a10ff0
--- /dev/null
+++ b/telegram-desktop-bin.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Telegram Desktop
+Comment=Official desktop version of Telegram messaging app
+Exec=telegram -- %u
+Icon=/usr/share/pixmaps/telegram.png
+Terminal=false
+Type=Application
+Categories=Network;
+MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg;
+X-Desktop-File-Install-Version=0.22
diff --git a/telegram-desktop-bin.install b/telegram-desktop-bin.install
index d49e64e89eb7..e5b7d581da45 100644
--- a/telegram-desktop-bin.install
+++ b/telegram-desktop-bin.install
@@ -1,17 +1,9 @@
 post_install() {
-
-      echo "Start from the console at the first run (using "telegram") to generate the .desktop file."
-      echo "After Update start Telegram with "/opt/telegram/Telegram" to get TelegramDesktop"
-      echo "If you see no destkop launcher after update, you can fix it by using"
-      echo "sed 's/Exec=-- %u/Exec=telegram -- %u/' -i ~/.local/share/applications/telegramdesktop.desktop"
-      
+	[ ! -z `which update-desktop-database` ]&& update-desktop-database -q
 }
 
 post_remove()
 {
-      echo "You can remove old data from a terminl doing:"
-      echo "rm -r ~/.local/share/applications/telegramdesktop.desktop"
-      echo "rm -r ~/.TelegramDesktop"
+	echo "You can remove old data from a terminl doing:"
+	echo "rm -r ~/.TelegramDesktop"
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/telegram-desktop-bin.png b/telegram-desktop-bin.png
new file mode 100644
index 000000000000..88b7432570a1
--- /dev/null
+++ b/telegram-desktop-bin.png
diff --git a/telegram b/telegram-desktop-bin.sh
index 86fc5894b36b..86fc5894b36b 100644
--- a/telegram
+++ b/telegram-desktop-bin.sh