Accepting request 954715 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/954715
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sushi?expand=0&rev=49

sushi.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Feb 13 00:10:06 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add typelib\\(LOKDocView\\) global requires exclude: We do not
+  want to mandate libreoffice install just for the file preview
+  funtion. If libreoffice is installed, the preview in will
+  function as expected.
+- Following the above, add (typelib(LOKDocView) if libreoffice)
+  Requires: Pull in the needed libreoffice glue if libreoffice is
+  installed.
+- Pass explicit wayland=enabled and X11=enabled to meson, ensure we
+  build support for both (we already have dependencies in place).
+
 -------------------------------------------------------------------
 Tue Sep 21 14:12:13 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 

sushi.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sushi
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,8 @@
 #
 
 
+%global __requires_exclude typelib\\(LOKDocView\\)
+
 Name:           sushi
 Version:        41.0
 Release:        0
@@ -48,6 +50,7 @@ BuildRequires:  pkgconfig(gtksourceview-4) >= 4.0.3
 BuildRequires:  pkgconfig(harfbuzz) >= 0.9.9
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
 Supplements:    nautilus
+Requires:       (typelib(LOKDocView) if libreoffice)
 
 %description
 Sushi is a quick previewer for Nautilus, the GNOME desktop file manager.
@@ -58,7 +61,10 @@ Sushi is a quick previewer for Nautilus, the GNOME desktop file manager.
 %autosetup -p1
 
 %build
-%meson
+%meson \
+	-D wayland=enabled \
+	-D X11=enabled \
+	%{nil}
 %meson_build
 
 %install