rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

- No longer run chrpath on bundled gnupg as it is not needed

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=705
This commit is contained in:
Tomáš Chvátal 2018-08-13 09:49:27 +00:00 committed by Git OBS Bridge
parent 4b1c3c8e03
commit 3177f4510a
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@ -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 Tue Aug 7 13:03:50 UTC 2018 - tchvatal@suse.com

9
libreoffice.spec
View File

@ -267,8 +267,6 @@ Obsoletes: %{name}-gtk3 < %{version}
%endif %endif
%if %{with system_gpgme} %if %{with system_gpgme}
BuildRequires: libgpgmepp-devel BuildRequires: libgpgmepp-devel
%else
BuildRequires: chrpath
%endif %endif
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: libboost_date_time-devel BuildRequires: libboost_date_time-devel
@ -1299,13 +1297,6 @@ mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/
install -m 0644 include/LibreOfficeKit/*.h %{buildroot}%{_includedir}/LibreOfficeKit/ install -m 0644 include/LibreOfficeKit/*.h %{buildroot}%{_includedir}/LibreOfficeKit/
%endif %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 # Symlink uno.py and unohelper.py so that python can find them
# This is done after the cache files generating on purpose # This is done after the cache files generating on purpose
mkdir -p %{buildroot}%{python3_sitelib} mkdir -p %{buildroot}%{python3_sitelib}