[packages/spotify-client] really needs openssl 0.9.8, but pld build is without OPENSSL_0_9_8 versioning
glen
glen at pld-linux.org
Tue Sep 10 21:51:49 CEST 2013
commit 9e1cd14c7384286c63d4d2e8dc726f56ce5a4fd8
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Sep 10 22:51:01 2013 +0300
really needs openssl 0.9.8, but pld build is without OPENSSL_0_9_8 versioning
spotify-client.spec | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/spotify-client.spec b/spotify-client.spec
index 4c50f32..412505c 100644
--- a/spotify-client.spec
+++ b/spotify-client.spec
@@ -16,7 +16,7 @@
Summary: Spotify music player native client
Name: spotify-client
Version: 0.9.1.55.gbdd3b79.203
-Release: 0.4
+Release: 0.7
# http://community.spotify.com/t5/Desktop-Linux/What-license-does-the-linux-spotify-client-use/td-p/173356
License: No modification permitted, non-redistributable
Group: Applications/Multimedia
@@ -48,9 +48,8 @@ ExclusiveArch: %{ix86} %{x8664}
# Bundled, we should not Provide these
%define _noautoprovfiles %{_libdir}/spotify-client/.*[.]so
-# Filter away the deps om bundled libs and those substituted
-# by symlinks and explicit Requires:.
-%define _noautoreq ^libssl.so.0.9.8 ^libcrypto.so.0.9.8 ^libcef.so [.]so[.][0-2][a-f]
+# Filter away the deps of bundled libs and those substituted by symlinks and explicit Requires:.
+%define _noautoreq '^libssl.so.0.9.8\\(OPENSSL_0.9.8\\)' '^libcrypto.so.0.9.8\\(OPENSSL_0.9.8\\)' ^libcef.so [.]so[.][0-2][a-f]
%description
Think of Spotify as your new music collection. Your library. Only this
@@ -78,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# use libs from openssl.spec at OPENSSL_0_9_8
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/libcrypto.so.0.9.8
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/libssl.so.0.9.8
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -105,9 +108,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/spotify-client/locales
%attr(755,root,root) %{_libdir}/spotify-client/spotify
%attr(755,root,root) %{_libdir}/spotify-client/libcef.so
-# openssl
-%attr(755,root,root) %{_libdir}/spotify-client/libcrypto.so.0.9.8
-%attr(755,root,root) %{_libdir}/spotify-client/libssl.so.0.9.8
# nss/nspr
%attr(755,root,root) %{_libdir}/spotify-client/libnspr4.so.0d
%attr(755,root,root) %{_libdir}/spotify-client/libnss3.so.1d
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spotify-client.git/commitdiff/9e1cd14c7384286c63d4d2e8dc726f56ce5a4fd8
More information about the pld-cvs-commit
mailing list