From 5944c8bcdc2e8455a1c243a7e2819ac25e3f4136 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 13:48:44 -0400
Subject: [PATCH] libspotify: fix disparate versioning for armv6l

armv6l provides a different libspotify version than all other archs.
Commit 35ff97c5cd04ceceeaec389ef7fe972b7f1ee6cf attempted to version the
armv6l package based on the library version, but the disparity breaks
xbps-src when trying to rebuild the dependant python3-pyspotify.
---
 srcpkgs/libspotify/template | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libspotify/template b/srcpkgs/libspotify/template
index a6dac13610..9888a20772 100644
--- a/srcpkgs/libspotify/template
+++ b/srcpkgs/libspotify/template
@@ -1,14 +1,15 @@
-#Template for the 'libspotify'
+# Template file for 'libspotify'
 pkgname=libspotify
+reverts="12.1.103_1"
 version=12.1.51
-revision=1
-short_desc="Spotify library for building your own streaming apps"
-maintainer="noah <nsawyer1993@gmail.com>"
+revision=2
 archs="x86_64 i686 armv5tel armv6l armv7l"
 wrksrc="libspotify-${version}-Linux-${XBPS_TARGET_MACHINE}-release"
-repository="nonfree"
-license="custom"
+short_desc="Spotify library for building your own streaming apps"
+maintainer="noah <nsawyer1993@gmail.com>"
+license="custom:Proprietary"
 homepage="https://developer.spotify.com/technologies/libspotify/"
+repository="nonfree"
 _libspotify_mopidy="https://github.com/mopidy/libspotify-archive/raw/master"
 
 if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then
@@ -22,10 +23,12 @@ elif [ "${XBPS_TARGET_MACHINE}" = "armv7l" ]; then
 	wrksrc="libspotify-${version}-Linux-armv7-release"
 	distfiles="${_libspotify_mopidy}/libspotify-${version}-Linux-armv7-release.tar.gz"
 elif [ "${XBPS_TARGET_MACHINE}" = "armv6l" ]; then
-	version=12.1.103
-	wrksrc="libspotify-${version}-Linux-armv6-bcm2708hardfp-release"
+	# Even though the library version is different, xbps-src breaks if
+	# the versioning of packages across archs is not consistent
+	_libversion=12.1.103
+	wrksrc="libspotify-${_libversion}-Linux-armv6-bcm2708hardfp-release"
 	checksum=d658e6c1978fb46cf33376eb8367a51d024f4014f21beac1dd264532bcc54b24
-	distfiles="${_libspotify_mopidy}/libspotify-${version}-Linux-armv6-bcm2708hardfp-release.tar.gz"
+	distfiles="${_libspotify_mopidy}/libspotify-${_libversion}-Linux-armv6-bcm2708hardfp-release.tar.gz"
 elif [ "${XBPS_TARGET_MACHINE}" = "armv5tel" ]; then
 	wrksrc="libspotify-${version}-Linux-armv5-release"
 	checksum=4d96efcb1423864683917f40fb4df481491250a76cb29be3a235b3732a64fefc