Merge remote-tracking branch 'upstream/master'

2 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6824bc934900..acde121fb13a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spotify-noshows
 	pkgdesc = Patched version of spotify AUR package excluding podcast recommendations from the home page
-	pkgver = 1.1.68.632
-	pkgrel = 1
+	pkgver = 1.1.72.439
+	pkgrel = 3
 	epoch = 1
 	url = https://www.spotify.com
 	arch = x86_64
@@ -23,14 +23,14 @@ pkgbase = spotify-noshows
 	options = !strip
 	source = spotify.protocol
 	source = LICENSE
-	source = spotify-1.1.68.632-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.68.632.g2b11de83_amd64.deb
-	source = spotify-1.1.68.632-Release::http://repository.spotify.com/dists/testing/Release
-	source = spotify-1.1.68.632-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg
-	source = spotify-1.1.68.632-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
-	validpgpkeys = 8FD3D9A8D3800305A9FFF259D1742AD60D811D58
+	source = spotify-1.1.72.439-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.72.439.gc253025e_amd64.deb
+	source = spotify-1.1.72.439-3-Release::http://repository.spotify.com/dists/testing/Release
+	source = spotify-1.1.72.439-3-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg
+	source = spotify-1.1.72.439-3-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
+	validpgpkeys = F9A211976ED662F00E59361E5E3C45D7B312C643
 	sha512sums = 999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb436bde3768af6ba1b90eaac78ea8589d82e621f9cbe7d9ab3f41acee6e8ca20
 	sha512sums = 2e16f7c7b09e9ecefaa11ab38eb7a792c62ae6f33d95ab1ff46d68995316324d8c5287b0d9ce142d1cf15158e61f594e930260abb8155467af8bc25779960615
-	sha512sums = 742bf459d7d87cc269a4c29cd2489753c6f7b62f3ee2150808c4931c29ee0d89f5b5ae47589112768e5958da73cba857074845fd017bd53c4574ea84c6770074
+	sha512sums = 65cec95448d936b7be93b0d16f29927a298b5b56aa2bc4834a5d357e341c78486fa69e61b3b6cf9fbe7da88c8d3b6ce3bccb5e963ed1b5a23320c0c808ccb385
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index cd9dc36110b4..bc5531098197 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 # Forked from https://aur.archlinux.org/packages/spotify/
 
 pkgname=spotify-noshows
-pkgver=1.1.68.632
+pkgver=1.1.72.439
 epoch=1
-_commit=g2b11de83
-pkgrel=1
+_commit=gc253025e
+pkgrel=3
 pkgdesc='Patched version of spotify AUR package excluding podcast recommendations from the home page'
 arch=('x86_64')
 license=('custom')
@@ -29,27 +29,30 @@ source=('spotify.protocol'
         'LICENSE'
         "${pkgname}-${pkgver}-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${pkgver}.${_commit}_amd64.deb"
         # GPG signature check
-        "${pkgname}-${pkgver}-Release::http://repository.spotify.com/dists/testing/Release"
-        "${pkgname}-${pkgver}-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg"
-        "${pkgname}-${pkgver}-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages")
+        "${pkgname}-${pkgver}-${pkgrel}-Release::http://repository.spotify.com/dists/testing/Release"
+        "${pkgname}-${pkgver}-${pkgrel}-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg"
+        "${pkgname}-${pkgver}-${pkgrel}-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages")
 sha512sums=('999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb436bde3768af6ba1b90eaac78ea8589d82e621f9cbe7d9ab3f41acee6e8ca20'
             '2e16f7c7b09e9ecefaa11ab38eb7a792c62ae6f33d95ab1ff46d68995316324d8c5287b0d9ce142d1cf15158e61f594e930260abb8155467af8bc25779960615'
-            '742bf459d7d87cc269a4c29cd2489753c6f7b62f3ee2150808c4931c29ee0d89f5b5ae47589112768e5958da73cba857074845fd017bd53c4574ea84c6770074'
+            '65cec95448d936b7be93b0d16f29927a298b5b56aa2bc4834a5d357e341c78486fa69e61b3b6cf9fbe7da88c8d3b6ce3bccb5e963ed1b5a23320c0c808ccb385'
             'SKIP'
             'SKIP'
             'SKIP')
-validpgpkeys=('8FD3D9A8D3800305A9FFF259D1742AD60D811D58') # Spotify <tux@spotify.com>
+# Import key with:
+# curl -sS https://download.spotify.com/debian/pubkey_5E3C45D7B312C643.gpg | gpg --import -
+validpgpkeys=('F9A211976ED662F00E59361E5E3C45D7B312C643') # Spotify Public Repository Signing Key <tux@spotify.com>
 # Old Keys:
+# 8FD3D9A8D3800305A9FFF259D1742AD60D811D58
 # 931FF8E79F0876134EDDBDCCA87FF9DF48BF1C90
 # 2EBF997C15BDA244B6EBF5D84773BD5E130D1D45
 
 prepare() {
     # Validate hashes from the PGP signed "Release" file
-    echo "$(grep non-free/binary-amd64/Packages ${pkgname}-${pkgver}-Release | tail -n 2 | head -n 1 | awk '{print $1}') ${pkgname}-${pkgver}-x86_64-Packages" \
+    echo "$(grep non-free/binary-amd64/Packages ${pkgname}-${pkgver}-${pkgrel}-Release | tail -n 2 | head -n 1 | awk '{print $1}') ${pkgname}-${pkgver}-${pkgrel}-x86_64-Packages" \
         > "${pkgname}-${pkgver}-x86_64-Packages.sha256"
     sha256sum -c "${pkgname}-${pkgver}-x86_64-Packages.sha256"
 
-    echo "$(grep SHA512 ${pkgname}-${pkgver}-x86_64-Packages | head -n 1 | awk '{print $2}') ${pkgname}-${pkgver}-x86_64.deb" \
+    echo "$(grep SHA512 ${pkgname}-${pkgver}-${pkgrel}-x86_64-Packages | head -n 1 | awk '{print $2}') ${pkgname}-${pkgver}-x86_64.deb" \
         > "${pkgname}-${pkgver}-x86_64.deb.sha512"
     sha512sum -c "${pkgname}-${pkgver}-x86_64.deb.sha512"
 }
@@ -59,6 +62,9 @@ package() {
 
     tar -xzf data.tar.gz -C "${pkgdir}"
 
+    # Enable spotify to open URLs from the webapp
+    sed -i 's/^Exec=.*/Exec=spotify --uri=%U/' "${pkgdir}"/usr/share/spotify/spotify.desktop
+
     install -Dm644 "${pkgdir}"/usr/share/spotify/spotify.desktop "${pkgdir}"/usr/share/applications/spotify.desktop
     install -Dm644 "${pkgdir}"/usr/share/spotify/icons/spotify-linux-512.png "${pkgdir}"/usr/share/pixmaps/spotify-client.png