Backport a patch to fix regression in --devel

https://lists.freedesktop.org/archives/flatpak/2017-August/000781.html
This commit is contained in:
Kalev Lember 2017-08-25 15:09:13 +02:00
parent 8645083bf6
commit e31ddd3479
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 2a661fd448a153992e07904b666ef4fb748810a3 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 25 Aug 2017 14:37:57 +0200
Subject: [PATCH] Fix regression in --devel
Commit 489bfddfb mistakenly ended a line with a comma instead of a semicolon which
caused --devel to break.
---
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 390a7751..a36c2e98 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -4641,7 +4641,7 @@ flatpak_run_app (const char *app_ref,
if ((flags & FLATPAK_RUN_FLAG_DEVEL) != 0)
key = FLATPAK_METADATA_KEY_SDK;
else
- key = FLATPAK_METADATA_KEY_RUNTIME,
+ key = FLATPAK_METADATA_KEY_RUNTIME;
metakey = flatpak_deploy_get_metadata (app_deploy);
default_runtime = g_key_file_get_string (metakey,
--
2.13.0

View File

@ -3,7 +3,7 @@
Name: flatpak
Version: 0.9.8
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Application deployment framework for desktop apps
Group: Development/Tools
@ -11,6 +11,9 @@ License: LGPLv2+
URL: http://flatpak.org/
Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-Fix-regression-in-devel.patch
BuildRequires: pkgconfig(fuse)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0
@ -184,6 +187,9 @@ flatpak remote-list --system &> /dev/null || :
%changelog
* Fri Aug 25 2017 Kalev Lember <klember@redhat.com> - 0.9.8-2
- Backport a patch to fix regression in --devel
* Mon Aug 21 2017 David King <amigadave@amigadave.com> - 0.9.8-1
- Update to 0.9.8