diff --git a/Makefile b/Makefile index 8343c40..366f99f 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,6 @@ SRPMSVERSIONSFILE = SRPMSVERSIONS pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack \ sun-java7 spotify chromium-pepper-flash endif -include $(SRPMSVERSIONSFILE) - PACKAGE = desktop-base-openmamba DISTROID = openmamba diff --git a/SRPMS/spotify/spotify-make-20150430.tar.gz b/SRPMS/spotify/spotify-make-20150430.tar.gz deleted file mode 100644 index 66e0d48..0000000 Binary files a/SRPMS/spotify/spotify-make-20150430.tar.gz and /dev/null differ diff --git a/SRPMS/spotify/spotify.spec.in b/SRPMS/spotify/spotify.spec.in index 551c9fc..383c7c6 100644 --- a/SRPMS/spotify/spotify.spec.in +++ b/SRPMS/spotify/spotify.spec.in @@ -1,4 +1,3 @@ -#% define spotify_make_ver 20130831git Name: spotify Version: @SRPMVERSION@ Release: @SRPMRELEASE@ @@ -9,9 +8,10 @@ Distribution: @distribution@ Packager: Silvan Calarco URL: https://www.spotify.com/us/download/previews/ ## GITSOURCE https://github.com/leamas/spotify-make.git master -Source: https://github.com/leamas/spotify-make/tarball/master/spotify-make-%{version}.tar.gz +#Source: https://github.com/leamas/spotify-make/tarball/master/spotify-make-%{version}.tar.gz Source1: LICENSE License: Not distributable +BuildRequires: git Requires: libopenssl100 Requires: zenity ## AUTOBUILDREQ-BEGIN @@ -22,8 +22,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Listen to music using Spotify. %prep -%setup -q -c -mv leamas-spotify-make-*/* . +%setup -q -c -T +git clone --depth=1 https://github.com/leamas/spotify-make.git +mv spotify-make/* . %build ./configure \ @@ -89,9 +90,12 @@ fi %dir /opt/spotify/share %dir /opt/spotify/share/spotify-client/ /opt/spotify/share/spotify-client/* -%{_mandir}/man1/spotify.1.gz +%{_mandir}/man1/spotify.1* %changelog +* Thu Aug 26 2015 Silvan Calarco 20150629-1mamba +- fetch spotify-make from git + * Thu Jan 29 2015 Silvan Calarco 20150129-1mamba - updated diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS index 6d60a6a..a55c970 100644 --- a/SRPMSVERSIONS +++ b/SRPMSVERSIONS @@ -11,7 +11,11 @@ SRPMRELEASE["msttcorefonts"]=7mamba SRPMVERSION["skype"]="`curl -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|" 2>/dev/null`" SRPMRELEASE["skype"]=2mamba # spotify -SRPMVERSION["spotify"]=20150430 +if [ "`uname -m`" == "x86_64" ]; then +SRPMVERSION["spotify"]=20150629 +else +SRPMVERSION["spotify"]=0 +fi SRPMRELEASE["spotify"]=1mamba # sun-java7 SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"