From 44e61ac73aaab42defd6bbb05039acbfbffae3b4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Apr 01 2022 22:20:53 +0000 Subject: Work with both FUSE 2 and FUSE 3 There is a general desire to migrate away from FUSE 2 to FUSE 3: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/UUOKLRLQHN2AC4SLAXERC7QAKW6FBSFX/ flatpak-builder requires FUSE indirectly through it's use of OSTree's rofiles-fuse binary. Until now, flatpak-builder could only work with a rofiles-fuse binary that was built against FUSE 2 because of the use of some optimization options that are only needed for FUSE 2 and hence don't work with FUSE 3. See: https://github.com/flatpak/flatpak-builder/commit/99b35552274150bd This disables the optimization in the hope that OSTree will switch to building against FUSE 3. In the meantime, flatpak-builder will be slower but will continue to work with FUSE 2. --- diff --git a/flatpak-builder.spec b/flatpak-builder.spec index ca21c79..f01b65c 100644 --- a/flatpak-builder.spec +++ b/flatpak-builder.spec @@ -5,7 +5,7 @@ Name: flatpak-builder Version: 1.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool to build flatpaks from source # src/builder-utils.c has portions derived from GPLv2+ code, @@ -67,7 +67,7 @@ See http://flatpak.org/ for more information. %build %configure \ --enable-docbook-docs \ - --with-fuse=2 \ + --with-fuse=3 \ --with-system-debugedit %make_build V=1 @@ -86,6 +86,9 @@ See http://flatpak.org/ for more information. %changelog +* Fri Apr 01 2022 Debarshi Ray - 1.2.2-3 +- Work with both FUSE 2 and FUSE 3 + * Thu Jan 20 2022 Fedora Release Engineering - 1.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild