From 70af66579910f06b24375a0f1976525656ab5806bcaf1811e21c02f553c8c9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 21 Apr 2015 09:17:58 +0000 Subject: [PATCH] - Try to deal with rpath on bundled libs OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=262 --- libreoffice.changes | 5 +++++ libreoffice.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index f4ff837..c7f7bd0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 21 09:17:33 UTC 2015 - tchvatal@suse.com + +- Try to deal with rpath on bundled libs + ------------------------------------------------------------------- Fri Apr 17 12:57:07 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 45176d6..6d5f199 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -238,6 +238,8 @@ BuildRequires: ucpp BuildRequires: vigra-devel BuildRequires: xml-commons-apis BuildRequires: pkgconfig(fbembed) +%else +BuildRequires: chrpath %endif BuildRequires: ImageMagick BuildRequires: ant @@ -1301,6 +1303,15 @@ cat file-lists/kde_list.txt >> file-lists/kde4_list.txt # Remove pointless readmes rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ +# Remove RPATH on some 3rd party bundled libs +%if !%{with systemlibs} +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3.so.3 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.3.so.3 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1.so.1 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 +%endif + # We have ton of duped files so run over it %fdupes %{buildroot}/usr