From 3177f4510abf17f33fa6fbed666762cf9aee992eab8152b332e6ea5ddebbf775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Aug 2018 09:49:27 +0000 Subject: [PATCH] - No longer run chrpath on bundled gnupg as it is not needed OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=705 --- libreoffice.changes | 5 +++++ libreoffice.spec | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index ef48d93..96b9677 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 13 09:47:41 UTC 2018 - tchvatal@suse.com + +- No longer run chrpath on bundled gnupg as it is not needed + ------------------------------------------------------------------- Tue Aug 7 13:03:50 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index af945d7..c7c2d53 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -267,8 +267,6 @@ Obsoletes: %{name}-gtk3 < %{version} %endif %if %{with system_gpgme} BuildRequires: libgpgmepp-devel -%else -BuildRequires: chrpath %endif %if 0%{?suse_version} > 1325 BuildRequires: libboost_date_time-devel @@ -1299,13 +1297,6 @@ mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/ install -m 0644 include/LibreOfficeKit/*.h %{buildroot}%{_includedir}/LibreOfficeKit/ %endif -%if !%{with system_gpgme} -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgmepp.so.6 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libassuan.so.0 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpg-error.so.0 -%endif - # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose mkdir -p %{buildroot}%{python3_sitelib}