- Supplement properly the qt5 and the plasma5-workspace

- Fix providing libgpg-error0 bsc#1072061 when bundling

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=565

libreoffice.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec 11 14:38:26 UTC 2017 - tchvatal@suse.com
+
+- Supplement properly the qt5 and the plasma5-workspace
+
+-------------------------------------------------------------------
+Mon Dec 11 12:09:26 UTC 2017 - tchvatal@suse.com
+
+- Fix providing libgpg-error0 bsc#1072061 when bundling
+
 -------------------------------------------------------------------
 Fri Dec  8 09:42:28 UTC 2017 - tchvatal@suse.com
 

libreoffice.spec

@@ -38,6 +38,11 @@
 %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
 %bcond_without system_gpgme
 %else
+# Hack in the bundled libs to not pop up on requires/provides to avoid
+# faking libreoffice provide some system packages
+%define _use_internal_dependency_generator 0
+%define __find_provides /bin/sh %_sourcedir/lo-provides %name
+%define __find_requires /bin/sh %_sourcedir/lo-requires %name
 %bcond_with system_gpgme
 %endif
 Name:           libreoffice
@@ -59,6 +64,8 @@ Source402:      %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu
 Source450:      %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
 Source452:      %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 # GPGME bundle list
+Source998:      lo-provides
+Source999:      lo-requires
 Source1000:     %{external_url}/gpgme-1.8.0.tar.bz2
 Source1001:     %{external_url}/libgpg-error-1.26.tar.bz2
 Source1002:     %{external_url}/libassuan-2.4.3.tar.bz2
@@ -499,9 +506,6 @@ Requires:       %{name}-gnome = %{version}
 %if 0%{?suse_version} > 1315 || 0%{?is_opensuse}
 Supplements:    packageand(libreoffice:gnome-session)
 %endif
-%if !%{with kdeintegration}
-Supplements:    packageand(libreoffice:plasma5-workspace)
-%endif
 
 %description gtk3
 This package contains Gtk3 interface rendering option for LibreOffice.
@@ -512,6 +516,7 @@ Group:          Productivity/Office/Suite
 Requires:       %{name} = %{version}
 Provides:       %{name}-kde4 = %{version}
 Obsoletes:      %{name}-kde4 < %{version}
+Supplements:    packageand(libreoffice:plasma5-workspace)
 
 %description qt5
 This package contains Qt5 interface rendering options for LibreOffice.
@@ -1203,6 +1208,7 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/
 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

lo-provides

@@ -0,0 +1,6 @@
+# hide some private libraries from provides
+grep -v -e libgpgme.so \
+        -e libgpgmepp.so \
+        -e libassuan.so \
+        -e libgpg-error.so \
+        | /usr/lib/rpm/find-provides “$@”

lo-requires

@@ -0,0 +1,6 @@
+# do not require some internal libraries
+/usr/lib/rpm/find-requires “$@” | \
+grep -v -e libgpgme.so \
+        -e libgpgmepp.so \
+        -e libassuan.so \
+        -e libgpg-error.so