Removed 32bit leftovers

2 files changed, 20 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f073840320c1..094cc1f627fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,24 +14,24 @@ pkgbase = spotify
 	depends = openssl
 	depends = nss
 	depends = at-spi2-atk
+	depends = libcurl-gnutls
 	optdepends = ffmpeg-compat-57: Adds support for playback of local files
 	optdepends = zenity: Adds support for importing local files
 	optdepends = libnotify: Desktop notifications
 	options = !strip
 	source = spotify.protocol
 	source = LICENSE
+	source = spotify-1.1.55.498-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.55.498.gf9a83c60_amd64.deb
 	source = spotify-1.1.55.498-Release::http://repository.spotify.com/dists/testing/Release
 	source = spotify-1.1.55.498-Release.sig::http://repository.spotify.com/dists/testing/Release.gpg
+	source = spotify-1.1.55.498-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
 	validpgpkeys = 8FD3D9A8D3800305A9FFF259D1742AD60D811D58
 	sha512sums = 999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb436bde3768af6ba1b90eaac78ea8589d82e621f9cbe7d9ab3f41acee6e8ca20
 	sha512sums = 2e16f7c7b09e9ecefaa11ab38eb7a792c62ae6f33d95ab1ff46d68995316324d8c5287b0d9ce142d1cf15158e61f594e930260abb8155467af8bc25779960615
+	sha512sums = 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
+	sha512sums = 4df76f404e3dcb65d2965856bdabb1cb75cf54a8d31c7d0f3334696b35cd8c091a3e96ec19fe50dc1a9c34934da8a09aea9273644108b161aba9237de042fcda
 	sha512sums = SKIP
-	sha512sums = SKIP
-	source_x86_64 = spotify-1.1.55.498-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.55.498.gf9a83c60_amd64.deb
-	source_x86_64 = spotify-1.1.55.498-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages
-	depends_x86_64 = libcurl-gnutls
-	sha512sums_x86_64 = 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
-	sha512sums_x86_64 = 674ae1c6d8d8cfee67369f83da936db6004468f4b8cd72c6ea190a4b68d3960f3d8c7d19f5d13eb6a381e1773b2f2c200096acb2316e65786cf1d9e519c49c38
+	sha512sums = 674ae1c6d8d8cfee67369f83da936db6004468f4b8cd72c6ea190a4b68d3960f3d8c7d19f5d13eb6a381e1773b2f2c200096acb2316e65786cf1d9e519c49c38
 
 pkgname = spotify
 
diff --git a/PKGBUILD b/PKGBUILD
index 7f5f795aba13..ac3cc9709489 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,9 +12,7 @@ pkgdesc='A proprietary music streaming service'
 arch=('x86_64')
 license=('custom')
 url='https://www.spotify.com'
-depends=('alsa-lib>=1.0.14' 'gtk3' 'libsystemd' 'libxss' 'desktop-file-utils' 'openssl' 'nss' 'at-spi2-atk')
-depends_x86_64=('libcurl-gnutls')
-depends_i686=('libcurl-compat')
+depends=('alsa-lib>=1.0.14' 'gtk3' 'libsystemd' 'libxss' 'desktop-file-utils' 'openssl' 'nss' 'at-spi2-atk' 'libcurl-gnutls')
 optdepends=('ffmpeg-compat-57: Adds support for playback of local files'
             'zenity: Adds support for importing local files'
             'libnotify: Desktop notifications')
@@ -28,37 +26,31 @@ options=('!strip')
 # http://repository.spotify.com/dists/testing/Release.gpg
 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")
-source_x86_64=("${pkgname}-${pkgver}-x86_64.deb::http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${pkgver}.${_commit}_amd64.deb"
-               "${pkgname}-${pkgver}-x86_64-Packages::http://repository.spotify.com/dists/testing/non-free/binary-amd64/Packages")
+        "${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")
 sha512sums=('999abe46766a4101e27477f5c9f69394a4bb5c097e2e048ec2c6cb93dfa1743eb436bde3768af6ba1b90eaac78ea8589d82e621f9cbe7d9ab3f41acee6e8ca20'
             '2e16f7c7b09e9ecefaa11ab38eb7a792c62ae6f33d95ab1ff46d68995316324d8c5287b0d9ce142d1cf15158e61f594e930260abb8155467af8bc25779960615'
+            '395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599'
+            '4df76f404e3dcb65d2965856bdabb1cb75cf54a8d31c7d0f3334696b35cd8c091a3e96ec19fe50dc1a9c34934da8a09aea9273644108b161aba9237de042fcda'
             'SKIP'
-            'SKIP')
-sha512sums_x86_64=('395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599'
-                   '674ae1c6d8d8cfee67369f83da936db6004468f4b8cd72c6ea190a4b68d3960f3d8c7d19f5d13eb6a381e1773b2f2c200096acb2316e65786cf1d9e519c49c38')
+            '674ae1c6d8d8cfee67369f83da936db6004468f4b8cd72c6ea190a4b68d3960f3d8c7d19f5d13eb6a381e1773b2f2c200096acb2316e65786cf1d9e519c49c38')
 validpgpkeys=('8FD3D9A8D3800305A9FFF259D1742AD60D811D58') # Spotify <tux@spotify.com>
 # Old Keys:
 # 931FF8E79F0876134EDDBDCCA87FF9DF48BF1C90
 # 2EBF997C15BDA244B6EBF5D84773BD5E130D1D45
 
-# Spotify uses different names for the arch
-if [ "${CARCH}" = "i686" ]; then
-    _SPOTIFY_ARCH=i386
-else
-    _SPOTIFY_ARCH=amd64
-fi
-
 prepare() {
     # Validate hashes from the PGP signed "Release" file
-    echo "$(grep non-free/binary-${_SPOTIFY_ARCH}/Packages ${pkgname}-${pkgver}-Release | tail -n 2 | head -n 1 | awk '{print $1}') ${pkgname}-${pkgver}-${CARCH}-Packages" \
-        > "${pkgname}-${pkgver}-${CARCH}-Packages.sha256"
-    sha256sum -c "${pkgname}-${pkgver}-${CARCH}-Packages.sha256"
+    echo "$(grep non-free/binary-amd64/Packages ${pkgname}-${pkgver}-Release | tail -n 2 | head -n 1 | awk '{print $1}') ${pkgname}-${pkgver}-x86_64-Packages" \
+        > "${pkgname}-${pkgver}-x86_64-Packages.sha256"
+    sha256sum -c "${pkgname}-${pkgver}-x86_64-Packages.sha256"
 
-    echo "$(grep SHA512 ${pkgname}-${pkgver}-${CARCH}-Packages | head -n 1 | awk '{print $2}') ${pkgname}-${pkgver}-${CARCH}.deb" \
-        > "${pkgname}-${pkgver}-${CARCH}.deb.sha512"
-    sha512sum -c "${pkgname}-${pkgver}-${CARCH}.deb.sha512"
+    echo "$(grep SHA512 ${pkgname}-${pkgver}-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"
 }
 
 package() {