diff --git a/.gitignore b/.gitignore index 6c67860..ce30222 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /flatpak-1.1.2.tar.xz /flatpak-1.1.3.tar.xz /flatpak-1.2.0.tar.xz +/flatpak-1.2.1.tar.xz diff --git a/build-export-disable-sandbox.patch b/build-export-disable-sandbox.patch deleted file mode 100644 index 14d6fb5..0000000 --- a/build-export-disable-sandbox.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ea227187d40a8194d389585b69a0120f782d1bde Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 28 Jan 2019 12:46:22 +0000 -Subject: [PATCH] build-export: Allow sandboxing on icon validator to be - disabled - -During build-time tests, we can't rely on bwrap working. - -Signed-off-by: Simon McVittie - -Closes: #2661 -Approved by: alexlarsson ---- - app/flatpak-builtins-build-export.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c -index 63d95493..79722421 100644 ---- a/app/flatpak-builtins-build-export.c -+++ b/app/flatpak-builtins-build-export.c -@@ -40,6 +40,7 @@ static gboolean opt_runtime; - static gboolean opt_update_appstream; - static gboolean opt_no_update_summary; - static gboolean opt_disable_fsync; -+static gboolean opt_disable_sandbox = FALSE; - static char **opt_gpg_key_ids; - static char **opt_exclude; - static char **opt_include; -@@ -67,6 +68,7 @@ static GOptionEntry options[] = { - { "timestamp", 0, 0, G_OPTION_ARG_STRING, &opt_timestamp, N_("Override the timestamp of the commit"), N_("TIMESTAMP") }, - { "collection-id", 0, 0, G_OPTION_ARG_STRING, &opt_collection_id, N_("Collection ID"), "COLLECTION-ID" }, - { "disable-fsync", 0, 0, G_OPTION_ARG_NONE, &opt_disable_fsync, "Do not invoke fsync()", NULL }, -+ { "disable-sandbox", 0, 0, G_OPTION_ARG_NONE, &opt_disable_sandbox, "Do not sandbox icon validator", NULL }, - - { NULL } - }; -@@ -373,10 +375,12 @@ validate_icon_file (GFile *file, GError **error) - args = g_ptr_array_new_with_free_func (g_free); - - #ifndef DISABLE_SANDBOXED_TRIGGERS -- add_args (args, validate_icon, "--sandbox", "512", "512", name, NULL); --#else -- add_args (args, validate_icon, "512", "512", name, NULL); -+ if (!opt_disable_sandbox) -+ add_args (args, validate_icon, "--sandbox", "512", "512", name, NULL); -+ else - #endif -+ add_args (args, validate_icon, "512", "512", name, NULL); -+ - g_ptr_array_add (args, NULL); - - if (!g_spawn_sync (NULL, (char **)args->pdata, NULL, 0, NULL, NULL, NULL, &err, &status, error)) --- -2.20.1 - diff --git a/flatpak.spec b/flatpak.spec index dbfb1a1..5adab45 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -2,17 +2,14 @@ %global ostree_version 2018.9 Name: flatpak -Version: 1.2.0 -Release: 4%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz -# https://github.com/flatpak/flatpak/pull/2661 -Patch0: build-export-disable-sandbox.patch - BuildRequires: pkgconfig(appstream-glib) BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -181,6 +178,9 @@ flatpak remote-list --system &> /dev/null || : %changelog +* Tue Feb 05 2019 Kalev Lember - 1.2.1-1 +- Update to 1.2.1 + * Mon Feb 4 2019 fedora-toolbox - 1.2.0-4 - Add an upstream patch to add flatpak build-export --disable-sandbox diff --git a/sources b/sources index 5f56e02..1f7665a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flatpak-1.2.0.tar.xz) = 05172d3599a9e4d084647295f04660a2632d1966f2abde1ff42916e79aaad0b97fbb2115640a31e1620c122fa62cda376a4efb6b76ac95cbf68e93ebd2cd0615 +SHA512 (flatpak-1.2.1.tar.xz) = df0c977fb152c2ba53ce02f72b9a59e4217ea5e7054147a3d57993a6a1b8cdb2565a2a365be5f7e1a0efa1e93cdf195eb92819056d85a237f4faaaf82ba8013f