Correct all the messup from previos co-maintenance

2 files changed, 15 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b11e3bb19e3e..79c9d1a94339 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spotify
 	pkgdesc = A proprietary music streaming service
 	pkgver = 1.1.84.716
-	pkgrel = 12
+	pkgrel = 13
 	epoch = 1
 	url = https://www.spotify.com
 	arch = x86_64
@@ -22,16 +22,15 @@ pkgbase = spotify
 	source = spotify.protocol
 	source = LICENSE
 	source = spotify-1.1.84.716-gc5f8b819-2-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.84.716.gc5f8b819-2_amd64.deb
-	source = spotify-1.1.84.716-12-Release::http://repository.spotify.com/dists/testing/Release
-	source = spotify-1.1.84.716-12-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg
-	source = spotify-1.1.84.716-12-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
-	validpgpkeys = F9A211976ED662F00E59361E5E3C45D7B312C643
+	source = spotify-1.1.84.716-13-Release::http://repository.spotify.com/dists/testing/Release
+	source = spotify-1.1.84.716-13-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg
+	source = spotify-1.1.84.716-13-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
 	validpgpkeys = E27409F51D1B66337F2D2F417A3A762FAFD4A51F
 	sha512sums = 999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb436bde3768af6ba1b90eaac78ea8589d82e621f9cbe7d9ab3f41acee6e8ca20
 	sha512sums = 2e16f7c7b09e9ecefaa11ab38eb7a792c62ae6f33d95ab1ff46d68995316324d8c5287b0d9ce142d1cf15158e61f594e930260abb8155467af8bc25779960615
 	sha512sums = 9ba6c2d155f683b9a38222d58a2a53a2a5f4b422ed1c0d603af87919ba8a68309aea3354278fd1d5d8142a1568d93b7e83b14c041e749b0c39f3bc155a633ef8
-	sha512sums = 367c67e9c31f0ecf4d93bb9dbe33688538ac83d6a874889ff219d7db9d79b94d10d959a6de4080a4f419e5d45537c8a0216ec1ea8c299679d89641d4b434799f
 	sha512sums = SKIP
-	sha512sums = b0ab27105fb6b51768b6831ec11d836ac30885ff4f7fc50dcdbf8888366656a8e7a3a777a969f9de50e42a4af80155b36f9f46c468216d44026a2aecb772a257
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = spotify
diff --git a/PKGBUILD b/PKGBUILD
index 3d4647726e9e..806444e45c1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
 # Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
-# Co-Maintainer: TobFromme < TobFromme {hat} pm {dont} me >
 # PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
+# Contributor: TobFromme < TobFromme {hat} pm {dont} me >
+# Contributor: Ashley Whetter <(firstname) @ awhetter.co.uk>
 # Contributor: Eothred <yngve.levinsen@gmail.com>
 
 pkgname=spotify
 pkgver=1.1.84.716
 epoch=1
 _commit=gc5f8b819-2
-pkgrel=12
+pkgrel=13
 pkgdesc='A proprietary music streaming service'
 arch=('x86_64')
 license=('custom')
@@ -24,7 +25,6 @@ options=('!strip')
 # http://repository.spotify.com/dists/testing/Release
 # http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
 # http://repository.spotify.com/dists/testing/Release.gpg
-
 source=('spotify.protocol'
         'LICENSE'
         "${pkgname}-${pkgver}-${_commit}-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${pkgver}.${_commit}_amd64.deb"
@@ -35,23 +35,20 @@ source=('spotify.protocol'
 sha512sums=('999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb436bde3768af6ba1b90eaac78ea8589d82e621f9cbe7d9ab3f41acee6e8ca20'
             '2e16f7c7b09e9ecefaa11ab38eb7a792c62ae6f33d95ab1ff46d68995316324d8c5287b0d9ce142d1cf15158e61f594e930260abb8155467af8bc25779960615'
             '9ba6c2d155f683b9a38222d58a2a53a2a5f4b422ed1c0d603af87919ba8a68309aea3354278fd1d5d8142a1568d93b7e83b14c041e749b0c39f3bc155a633ef8'
-            '367c67e9c31f0ecf4d93bb9dbe33688538ac83d6a874889ff219d7db9d79b94d10d959a6de4080a4f419e5d45537c8a0216ec1ea8c299679d89641d4b434799f'
             'SKIP'
-            'b0ab27105fb6b51768b6831ec11d836ac30885ff4f7fc50dcdbf8888366656a8e7a3a777a969f9de50e42a4af80155b36f9f46c468216d44026a2aecb772a257')
-
-validpgpkeys=('F9A211976ED662F00E59361E5E3C45D7B312C643' 'E27409F51D1B66337F2D2F417A3A762FAFD4A51F') # Spotify Public Repository Signing Key <tux@spotify.com>
+            'SKIP'
+            'SKIP')
 
+# Import key with:
+# curl -sS https://download.spotify.com/debian/pubkey_7A3A762FAFD4A51F.gpg | gpg --import -
+validpgpkeys=('E27409F51D1B66337F2D2F417A3A762FAFD4A51F') # Spotify Public Repository Signing Key <tux@spotify.com>
 # Old Keys:
+# F9A211976ED662F00E59361E5E3C45D7B312C643
 # 8FD3D9A8D3800305A9FFF259D1742AD60D811D58
 # 931FF8E79F0876134EDDBDCCA87FF9DF48BF1C90
 # 2EBF997C15BDA244B6EBF5D84773BD5E130D1D45
 
 prepare() {
-    echo -e "\nINSTALLATION NOTE:\n"
-    echo -e "If installation fails with 'One or more PGP signatures could not be verified', then install the key with:\n"
-    echo -e "  curl -sS https://download.spotify.com/debian/pubkey_7A3A762FAFD4A51F.gpg | gpg --import -\n"
-    echo -e "Then retry the installation.\n"
-
     # Validate hashes from the PGP signed "Release" file
     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"