Moved back to GPG instructions instead

2 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 381cb6f73fba..9a765cf0ec7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spotify
 	pkgdesc = A proprietary music streaming service
 	pkgver = 1.1.84.716
-	pkgrel = 10
+	pkgrel = 11
 	epoch = 1
 	url = https://www.spotify.com
 	arch = x86_64
@@ -23,9 +23,9 @@ 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-10-Release::http://repository.spotify.com/dists/testing/Release
-	source = spotify-1.1.84.716-10-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg
-	source = spotify-1.1.84.716-10-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
+	source = spotify-1.1.84.716-11-Release::http://repository.spotify.com/dists/testing/Release
+	source = spotify-1.1.84.716-11-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg
+	source = spotify-1.1.84.716-11-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
 	validpgpkeys = F9A211976ED662F00E59361E5E3C45D7B312C643
 	validpgpkeys = E27409F51D1B66337F2D2F417A3A762FAFD4A51F
 	sha512sums = 999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb436bde3768af6ba1b90eaac78ea8589d82e621f9cbe7d9ab3f41acee6e8ca20
diff --git a/PKGBUILD b/PKGBUILD
index 5e6e20a190b8..332b3cf6be3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=spotify
 pkgver=1.1.84.716
 epoch=1
 _commit=gc5f8b819-2
-pkgrel=10
+pkgrel=11
 pkgdesc='A proprietary music streaming service'
 arch=('x86_64')
 license=('custom')
@@ -39,11 +39,6 @@ sha512sums=('999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb43
             'SKIP'
             'b0ab27105fb6b51768b6831ec11d836ac30885ff4f7fc50dcdbf8888366656a8e7a3a777a969f9de50e42a4af80155b36f9f46c468216d44026a2aecb772a257')
 
-# Import current GPG key, if it is not already
-if [[ ! $(gpg -k E27409F51D1B66337F2D2F417A3A762FAFD4A51F 2>/dev/null) ]]; then
-    curl -sS https://download.spotify.com/debian/pubkey_7A3A762FAFD4A51F.gpg | gpg --import -i -
-fi
-
 validpgpkeys=('F9A211976ED662F00E59361E5E3C45D7B312C643' 'E27409F51D1B66337F2D2F417A3A762FAFD4A51F') # Spotify Public Repository Signing Key <tux@spotify.com>
 
 # Old Keys:
@@ -52,6 +47,11 @@ validpgpkeys=('F9A211976ED662F00E59361E5E3C45D7B312C643' 'E27409F51D1B66337F2D2F
 # 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}-${CARCH}-Packages" \
         > "${pkgname}-${pkgver}-${CARCH}-Packages.sha256"