commit 7c033620f25000e1ba130eddc0ffbe3c2b0ab723 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Jul 30 22:53:42 2016 +0100 Update Spotify to 1.0.32.96.g3c8a06e6-37 for amd64, -3 for i386 - Move spotify-make to main package, no need dowload it every time - Use branch devel of spotify-make, supports and install Spotify 1.0.32 correctly - Update scriptlets https://fedoraproject.org/wiki/Packaging:Scriptlets#Icon_Cache - Update __requires_exclude with libcurl.so and remove which aren't in use anymore - Use Robxu9 commit. .gitignore | 2 ++ lpf-spotify-client.spec | 22 ++++++++++++++++++++-- sources | 1 + spotify-client.spec.in | 39 ++++++++++++++++++++------------------- 4 files changed, 43 insertions(+), 21 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..1adc185 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/spotify-make-8597389.tar.gz +/spotify-make-a0048ec.tar.gz diff --git a/lpf-spotify-client.spec b/lpf-spotify-client.spec index 4108e81..f7711d4 100644 --- a/lpf-spotify-client.spec +++ b/lpf-spotify-client.spec @@ -1,9 +1,17 @@ # %%bal will not work here, lazy evaluation needed. + +#devel branch +%global github_repo https://github.com/leamas/spotify-make/archive/%{commit} +%global github_repo https://github.com/robxu9/spotify-make/archive/%{commit} +%global commit 8597389ba7bf755418e8746b9c20af51e4be2bc0 +%global commit a0048ec7c5c6acf4ca584348684150b91328227d +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + %define target_pkg %(t=%{name}; echo ${t#lpf-}) Name: lpf-spotify-client # Upstream spotify version, verbatim. -Version: 0.9.17.1.g9b85d43.7 +Version: 1.0.32.96.g3c8a06e6 Release: 1%{?dist} Summary: Spotify music player native client package bootstrap @@ -17,6 +25,7 @@ Source0: spotify-client.spec.in Source1: eula.txt Source2: LICENSE Source3: README +Source4: %{github_repo}/spotify-make-%{shortcommit}.tar.gz BuildRequires: desktop-file-utils BuildRequires: lpf >= 0.1 @@ -42,7 +51,7 @@ cp %{SOURCE3} README %install # lpf-setup-pkg [eula] <topdir> <specfile> [sources...] -/usr/share/lpf/scripts/lpf-setup-pkg %{SOURCE1} %{buildroot} %{SOURCE0} +/usr/share/lpf/scripts/lpf-setup-pkg %{SOURCE1} %{buildroot} %{SOURCE0} %{SOURCE4} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -67,6 +76,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Jul 29 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 1.0.32.96.g3c8a06e6-1 +- Update Spotify to 1.0.32.96.g3c8a06e6-37 for amd64, -3 for i386 +- Move spotify-make to main package, no need dowload it every time +- Use branch devel of spotify-make, supports and install Spotify 1.0.32 correctly +- Update scriptlets https://fedoraproject.org/wiki/Packaging:Scriptlets#Icon_Cache +- Update __requires_exclude with libcurl.so and remove which aren't in use + anymore +- Use Robxu9 commit. + * Wed May 06 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 0.9.17.1.g9b85d43.7-1 - Update to 0.9.17.1.g9b85d43.7 and fix rfbz #3408 diff --git a/sources b/sources index e69de29..c502703 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ae6f8bd23b7e016f42e7aef7577a52a2 spotify-make-a0048ec.tar.gz diff --git a/spotify-client.spec.in b/spotify-client.spec.in index fcec6c2..104463d 100644 --- a/spotify-client.spec.in +++ b/spotify-client.spec.in @@ -1,9 +1,8 @@ #These refer to the installer, not the main package: -%global commit d81d63eeb6d4961e48e92dcfef17a0c967e8b4f8 +%global commit a0048ec7c5c6acf4ca584348684150b91328227d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global repo http://repository.spotify.com/pool/non-free/s/spotify -%global github_repo https://github.com/leamas/spotify-make/archive/%{commit} +%global repo http://repository.spotify.com/pool/non-free/s/spotify-client/ # We cannot strip this binary (licensing restrictions). %global debug_package %{nil} @@ -12,7 +11,7 @@ Name: spotify-client -Version: 0.9.17.1.g9b85d43.7 +Version: 1.0.32.96.g3c8a06e6 Release: 1%{?dist} Summary: Spotify music player native client @@ -23,11 +22,11 @@ URL: http://www.spotify.com/se/blog/archives/2010/07/12/linux/ Group: Applications/Multimedia ExclusiveArch: i386 i686 x86_64 -Source0: %{github_repo}/spotify-make-%{version}-%{shortcommit}.tar.gz +Source0: spotify-make-%{shortcommit}.tar.gz #Source1: %{repo}/spotify-client_%{version}-1_amd64.deb -Source1: %{repo}/spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb +Source1: %{repo}/spotify-client_1.0.32.96.g3c8a06e6-37_amd64.deb #Source2: %{repo}/spotify-client_%{version}-1_i386.deb -Source2: %{repo}/spotify-client_0.9.4.183.g644e24e.428-1_i386.deb +Source2: %{repo}/spotify-client_1.0.32.96.g3c8a06e6-3_i386.deb %ifarch x86_64 %global spotify_pkg %{SOURCE1} @@ -73,12 +72,11 @@ hard drive. # by symlinks and explicit Requires:. %global __requires_exclude ^libssl.so.1.0.0 %global __requires_exclude %__requires_exclude|^libcrypto.so.1.0.0 -%global __requires_exclude %__requires_exclude|^libssl.so.0.9.8 -%global __requires_exclude %__requires_exclude|^libcrypto.so.0.9.8 %global __requires_exclude %__requires_exclude|^libcef.so -%global __requires_exclude %__requires_exclude|^libudev.so.0 -%global __requires_exclude %__requires_exclude|^libgcrypt.so.11 -%global __requires_exclude %__requires_exclude|[.]so[.][0-2][a-f] +#global __requires_exclude %__requires_exclude|^libudev.so.0 +#global __requires_exclude %__requires_exclude|^libgcrypt.so.11 +%global __requires_exclude %__requires_exclude|^libcurl.so.4 +#global __requires_exclude %__requires_exclude|[.]so[.][0-2][a-f] %prep @@ -94,22 +92,22 @@ make install DESTDIR=%{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%doc opt/spotify/spotify-client/licenses.xhtml -%doc opt/spotify/spotify-client/readme.fedora -%doc opt/spotify/spotify-client/changelog +#doc opt/spotify/spotify-client/licenses.xhtml +#doc opt/spotify/spotify-client/readme.fedora +%doc usr/share/doc/spotify-client/changelog.gz %{_libdir}/spotify-client %{_bindir}/spotify %{_mandir}/man1/spotify.* @@ -120,6 +118,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jul 29 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 1.0.32.96.g3c8a06e6-1 +- Update Spotify to 1.0.32.96.g3c8a06e6-37 for amd64, -3 for i386 + * Wed May 06 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 0.9.17.1.g9b85d43.7-1 - Update to 0.9.17.1.g9b85d43.7 and fix rfbz #3408