diff --git a/find-requires.sh b/find-requires.sh deleted file mode 100755 index 042daad..0000000 --- a/find-requires.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -/usr/lib/rpm/find-requires | \ - sed -e 's/lib\(nss3\|nssutil3\|smime3\|plc4\|nspr4\)\.so\.[01]d/lib\1.so/ - /lib\(crypto\|ssl\)\.so/d' diff --git a/spotify-client.spec b/spotify-client.spec index 512dc35..fe490c2 100644 --- a/spotify-client.spec +++ b/spotify-client.spec @@ -22,6 +22,9 @@ %global __arch_install_post \ %( echo %{__arch_install_post} | sed '/check-rpaths/d' ) +%ifarch x86_64 +%global req_64 ()(64bit) +%endif Name: spotify-client Version: 0.8.8.323.gd143501.250 @@ -38,7 +41,6 @@ Source1: spotify-client_%{version}-%{release}_i386.deb %endif Source2: pkg-bundled-README Source3: spotify.sh -Source4: find-requires.sh NoSource: 0 %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -53,6 +55,11 @@ BuildRequires: mozilla-nspr Requires: hicolor-icon-theme Requires: zenity +# Symlinked, not picked up by dep-checker (all 3) +Requires: libopenssl1_0_0%{?req_64} +Requires: mozilla-nss%{?req_64} +Requires: mozilla-nspr%{?req_64} + Recommends: libmp3lame0 %endif @@ -84,8 +91,18 @@ It includes the following features: - Social media integration with Facebook and Twitter - 3rd-party applications integrated into the client -%define _use_internal_dependency_generator 0 -%define __find_requires %{SOURCE4} + +# Bundled, we should not Provide these. Using builtin filtering: +# http://rpm.org/wiki/PackagerDocs/DependencyGenerator +%global __provides_exclude_from ^%{_libdir}/spotify-client/.*[.]so + +# Filter away the deps om bundled libs and those substituted +# by symlinks and explicit Requires:. +%global __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|[.]so[.][0-2][a-f] + %prep @@ -107,6 +124,10 @@ make install DESTDIR=%{buildroot} # http://en.opensuse.org/openSUSE:Packaging_desktop_menu_categories#Multimedia %suse_update_desktop_file spotify +cd %{buildroot}%{_libdir}/spotify-client +ln -sf /lib/libssl.so.1.0.0 libssl.so.0.9.8 +ln -sf /lib/libcrypto.so.1.0.0 libcrypto.so.0.9.8 + %post %desktop_database_post