Merging midgard's commit 70c2ffac@https://framagit.org/Midgard/aur-tor-browser.git ("Spring cleaning")

3 files changed, 30 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce0ccc83b2cc..8fe726f5ffc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tor-browser-ru
-	pkgdesc = Tor Browser Bundle: Anonymous browsing using firefox and tor (ru)
+	pkgdesc = Tor Browser Bundle: anonymous browsing using Firefox and Tor (ru)
 	pkgver = 7.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.torproject.org/projects/torbrowser.html
 	install = tor-browser.install
 	arch = i686
@@ -24,8 +24,8 @@ pkgbase = tor-browser-ru
 	depends = sqlite
 	optdepends = zenity: simple dialog boxes
 	optdepends = kdialog: KDE dialog boxes
-	optdepends = gst-plugins-good: h.264 video
-	optdepends = gst-libav: h.264 video
+	optdepends = gst-plugins-good: H.264 video
+	optdepends = gst-libav: H.264 video
 	optdepends = libpulse: PulseAudio audio driver
 	optdepends = libnotify: Gnome dialog boxes
 	noextract = tor-browser-linux64-7.5.1_ru.tar.xz
@@ -34,17 +34,17 @@ pkgbase = tor-browser-ru
 	source = tor-browser.png
 	source = tor-browser.sh
 	validpgpkeys = EF6E286DDA85EA2A4BA7DE684E2C6E8793298290
-	md5sums = 9178c9325979377f7ec57569b15fcb61
-	md5sums = 494afbfa60fb4ce21840244cc3f7208c
-	md5sums = 120910366e4094c652fe7c4ee55abbca
+	sha256sums = 5926477b1c56b0a21549ced1faeb3f232d0e4641a184acd65774f890af7b58e8
+	sha256sums = 17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b
+	sha256sums = 3a491ad1a476f2fb343f274eab4e8df925637438e6dac3591f092b3ef3294da3
 	source_i686 = https://dist.torproject.org/torbrowser/7.5.1/tor-browser-linux32-7.5.1_ru.tar.xz
 	source_i686 = https://dist.torproject.org/torbrowser/7.5.1/tor-browser-linux32-7.5.1_ru.tar.xz.asc
-	md5sums_i686 = SKIP
-	md5sums_i686 = SKIP
+	sha256sums_i686 = SKIP
+	sha256sums_i686 = SKIP
 	source_x86_64 = https://dist.torproject.org/torbrowser/7.5.1/tor-browser-linux64-7.5.1_ru.tar.xz
 	source_x86_64 = https://dist.torproject.org/torbrowser/7.5.1/tor-browser-linux64-7.5.1_ru.tar.xz.asc
-	md5sums_x86_64 = SKIP
-	md5sums_x86_64 = SKIP
+	sha256sums_x86_64 = SKIP
+	sha256sums_x86_64 = SKIP
 
 pkgname = tor-browser-ru
 
diff --git a/PKGBUILD b/PKGBUILD
index 2d2a790e8380..da209ab001bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Fabio Loli <loli_fabio@protonmail.com>
-# Contributor: grufo <madmurphy333 AT gmail DOT com>
-# Contributor: vitamin1980 <vitamin.novgorod @ yandex.ru>
+# Maintainer: grufo <madmurphy333 AT gmail DOT com>
+# Contributor: midgard <arch.midgard AT janmaes DOT com>
 # Contributor: TrialnError <autumn-wind AT web DOT de>
+# Contributor: Fabio Loli <loli_fabio AT protonmail DOT com>
+# Contributor: vitamin1980 <vitamin DOT novgorod AT yandex DOT ru>
 # Contributor: Yardena Cohen <yardenack AT gmail DOT com>
 # Contributor: Max Roder <maxroder AT web DOT de>
 # Contributor: Sebastian Jug <seb AT stianj DOT ug>
@@ -22,8 +23,8 @@ _language='ru'
 _pkgname='tor-browser'
 pkgname="${_pkgname}-${_language,,}"
 pkgver='7.5.1'
-pkgrel='1'
-pkgdesc="Tor Browser Bundle: Anonymous browsing using firefox and tor (${_language})"
+pkgrel='2'
+pkgdesc="Tor Browser Bundle: anonymous browsing using Firefox and Tor (${_language})"
 url='https://www.torproject.org/projects/torbrowser.html'
 arch=('i686' 'x86_64')
 _idstr32='linux32'
@@ -34,8 +35,8 @@ depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
 	'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite')
 optdepends=('zenity: simple dialog boxes'
 	'kdialog: KDE dialog boxes'
-	'gst-plugins-good: h.264 video'
-	'gst-libav: h.264 video'
+	'gst-plugins-good: H.264 video'
+	'gst-libav: H.264 video'
 	'libpulse: PulseAudio audio driver'
 	'libnotify: Gnome dialog boxes')
 install="${_pkgname}.install"
@@ -50,19 +51,21 @@ source=("${_pkgname}.desktop"
 	"${_pkgname}.png"
 	"${_pkgname}.sh")
 
-md5sums=('9178c9325979377f7ec57569b15fcb61'
-	'494afbfa60fb4ce21840244cc3f7208c'
-	'120910366e4094c652fe7c4ee55abbca')
-md5sums_i686=('SKIP'
-	'SKIP')
-md5sums_x86_64=('SKIP'
-	'SKIP')
+sha256sums=('5926477b1c56b0a21549ced1faeb3f232d0e4641a184acd65774f890af7b58e8'
+            '17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b'
+            '3a491ad1a476f2fb343f274eab4e8df925637438e6dac3591f092b3ef3294da3')
+sha256sums_i686=('SKIP'
+                 'SKIP')
+sha256sums_x86_64=('SKIP'
+                   'SKIP')
 
 noextract=("${_pkgname}-${_idstr64}-${pkgver}_${_language}.tar.xz"
 	"${_pkgname}-${_idstr32}-${pkgver}_${_language}.tar.xz")
 
 package() {
 
+	cd "${srcdir}"
+
 	sed -i "s/__REPL_LANGUAGE__/${_language}/g"	"${_pkgname}.desktop"
 	sed -i "s/__REPL_NAME__/${pkgname}/g"		"${_pkgname}.desktop"
 
diff --git a/tor-browser.desktop b/tor-browser.desktop
index 3728ece546bf..c66a18d76b7f 100644
--- a/tor-browser.desktop
+++ b/tor-browser.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Tor-Browser (__REPL_LANGUAGE__)
+Name=Tor Browser (__REPL_LANGUAGE__)
 Exec=/usr/bin/__REPL_NAME__
 Icon=/usr/share/pixmaps/__REPL_NAME__.png
 Categories=Network;
-Comment=Anonymous browsing using firefox and tor
+Comment=Anonymous browsing using Firefox and Tor