Accepting request 1170025 from home:rfrohl:branches:GNOME:Factory

flatpak: build loop fix

OBS-URL: https://build.opensuse.org/request/show/1170025
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=196

flatpak.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 23 13:23:52 UTC 2024 - Robert Frohl <rfrohl@suse.com>
+
+- disable parental controls for now by using '-Dmalcontent=disabled', to work around
+  issues with xdg-desktop-portal
+
 -------------------------------------------------------------------
 Fri Apr 19 08:05:28 UTC 2024 - Robert Frohl <rfrohl@suse.com>
 

flatpak.spec

@@ -87,7 +87,6 @@ BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.4
 BuildRequires:  pkgconfig(libzstd) >= 0.8.1
-BuildRequires:  pkgconfig(malcontent-0)
 BuildRequires:  pkgconfig(ostree-1) >= %{ostree_version}
 BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(systemd)
@@ -167,8 +166,8 @@ more information.
 Summary:        Add Flathub repository to system flatpak
 Group:          System/Packages
 Requires:       flatpak
-Requires(postun): flatpak
-Requires(postun): sed
+Requires(postun):flatpak
+Requires(postun):sed
 %if 0%{?suse_version} > 1600
 Supplements:    flatpak
 %endif
@@ -220,6 +219,7 @@ sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-*
         -Dwayland_security_context=enabled \
         -Dselinux_module=enabled \
         -Dtests=false \
+        -Dmalcontent=disabled \
         %{nil}
 %meson_build
 %sysusers_generate_pre system-helper/flatpak.conf system-user-flatpak flatpak.conf