From 8de75ae754a78efa036120d0c96ceff91d94c40c Mon Sep 17 00:00:00 2001 From: David King Date: Sep 06 2016 14:01:03 +0000 Subject: Look for bwrap in PATH --- diff --git a/flatpak-0.6.9-look-up-bwrap-in-path.patch b/flatpak-0.6.9-look-up-bwrap-in-path.patch new file mode 100644 index 0000000..8fbf9e2 --- /dev/null +++ b/flatpak-0.6.9-look-up-bwrap-in-path.patch @@ -0,0 +1,24 @@ +From 983b2a5db124a44d86f8e6577763df8544d73838 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Tue, 6 Sep 2016 15:28:26 +0200 +Subject: [PATCH] lib: Look for "bwrap" in PATH when launching from libflatpak + +We forgot to look in the path, which made it fail when using +the system bwrap and not passing a full path. +--- + common/flatpak-run.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 1c06574..8e63a62 100644 +--- a/common/flatpak-run.c ++++ b/common/flatpak-run.c +@@ -3413,7 +3413,7 @@ flatpak_run_app (const char *app_ref, + if (!g_spawn_async (NULL, + (char **) real_argv_array->pdata, + envp, +- G_SPAWN_DEFAULT, ++ G_SPAWN_SEARCH_PATH, + child_setup, fd_array, + NULL, + error)) diff --git a/flatpak.spec b/flatpak.spec index 2575c36..219754a 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -1,12 +1,14 @@ Name: flatpak Version: 0.6.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application deployment framework for desktop apps Group: Development/Tools License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz +# Taken from upstream git. +Patch0: flatpak-0.6.9-look-up-bwrap-in-path.patch BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gio-unix-2.0) @@ -95,6 +97,7 @@ This package contains libflatpak. %prep %setup -q +%patch0 -p1 %build @@ -178,6 +181,9 @@ flatpak remote-list --system %changelog +* Tue Sep 06 2016 David King - 0.6.9-2 +- Look for bwrap in PATH + * Thu Aug 25 2016 David King - 0.6.9-1 - Update to 0.6.9