From bb61759d1f88e5639a4e7d4097bc9c9240bab1bbc7a5f910c231d108669bb36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 16 Aug 2019 11:44:19 +0000 Subject: [PATCH] - Fix syntax for RPM on SLE12 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=808 --- libreoffice.changes | 5 +++++ libreoffice.spec | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 9a4c3c6..86f77d7 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 16 11:43:53 UTC 2019 - Tomáš Chvátal + +- Fix syntax for RPM on SLE12 + ------------------------------------------------------------------- Fri Aug 16 08:31:36 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 6cd6603..c5f5fce 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -560,9 +560,12 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice. Summary: Gtk3 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name}-gnome = %{version} -Supplements: (libreoffice and gnome-session) -Supplements: (libreoffice and mate-session-manager) -Supplements: (libreoffice and xfce4-session) +Supplements: packageand(libreoffice:gnome-session) +Supplements: packageand(libreoffice:mate-session-manager) +Supplements: packageand(libreoffice:xfce4-session) +%if !%{with kdeintegration} +Supplements: packageand(libreoffice:plasma5-workspace) +%endif %description gtk3 This package contains Gtk3 interface rendering option for LibreOffice. @@ -574,11 +577,11 @@ Recommends: %{name}-gnome = %{version} Conflicts: %{name}-gnome < %{version} # We are default if gtk3 is not present %if !%{with gtk3} -Supplements: (libreoffice and gnome-session) -%endif -# Without kde integration we provide gtk2 interface there +Supplements: packageand(libreoffice:gnome-session) +# Without kde and gtk3 ntegration we provide gtk2 interface there %if !%{with kdeintegration} -Supplements: (libreoffice and plasma5-workspace) +Supplements: packageand(libreoffice:plasma5-workspace) +%endif %endif %description gtk2