Enable malcontent support

This also brings back the systemd system env generator that we had
problems with before -- hopefully we can figure out the selinux policy
support this time.

flatpak.spec

@@ -3,7 +3,7 @@
 
 Name:           flatpak
 Version:        1.11.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application deployment framework for desktop apps
 
 License:        LGPLv2+
@@ -25,6 +25,7 @@ BuildRequires:  pkgconfig(libsoup-2.4)
 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(xau)
@@ -147,12 +148,6 @@ install -D -t %{buildroot}%{_unitdir} %{SOURCE1}
 rm -f %{buildroot}%{_libdir}/libflatpak.la
 %find_lang %{name}
 
-# Work around selinux denials, see
-# https://github.com/flatpak/flatpak/issues/4128 for details. Note that we are
-# going to need the system env generator if we should enable malcontent support
-# in the future.
-rm %{buildroot}%{_systemd_system_env_generator_dir}/60-flatpak-system-only
-
 %pre
 getent group flatpak >/dev/null || groupadd -r flatpak
 getent passwd flatpak >/dev/null || \
@@ -228,6 +223,7 @@ fi
 %{_unitdir}/flatpak-system-helper.service
 %{_userunitdir}/flatpak-oci-authenticator.service
 %{_userunitdir}/flatpak-portal.service
+%{_systemd_system_env_generator_dir}/60-flatpak-system-only
 %{_systemd_user_env_generator_dir}/60-flatpak
 
 %files devel
@@ -259,6 +255,9 @@ fi
 
 
 %changelog
+* Thu Sep 09 2021 Kalev Lember <klember@redhat.com> - 1.11.3-2
+- Enable malcontent support
+
 * Wed Aug 25 2021 Kalev Lember <klember@redhat.com> - 1.11.3-1
 - Update to 1.11.3