- remove outdated patch

- apply x32 patch
- adapter

diff --git a/flatpak-0.6.14-fix-gnome-software-crash.patch b/flatpak-0.6.14-fix-gnome-software-crash.patch
deleted file mode 100644 (file)
index 83b4f55..0000000
--- a/flatpak-0.6.14-fix-gnome-software-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 31ca19eb99dbd588a1995898ab1baf6cef2180d6 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Tue, 29 Nov 2016 16:59:48 +0100
-Subject: [PATCH] pull: Exit early on error without aborting transaction
-
-At this point we have not set up repo yet, so aborting would crash.
----
- common/flatpak-dir.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
-index 8213440..1094cf4 100644
---- a/common/flatpak-dir.c
-+++ b/common/flatpak-dir.c
-@@ -1563,13 +1563,13 @@ flatpak_dir_pull (FlatpakDir          *self,
-   g_autoptr(GPtrArray) subdirs_arg = NULL;
- 
-   if (!flatpak_dir_ensure_repo (self, cancellable, error))
--    goto out;
-+    return FALSE;
- 
-   if (!ostree_repo_remote_get_url (self->repo,
-                                    repository,
-                                    &url,
-                                    error))
--    goto out;
-+    return FALSE;
- 
-   if (*url == 0)
-     return TRUE; /* Empty url, silently disables updates */

diff --git a/flatpak.spec b/flatpak.spec
index b16c6fd1aa56379e32c9d835ce998f9a3e8b838f..9ef0aa6598e1a5426164620fd12ffd677f8cdcc2 100644 (file)
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -11,11 +11,10 @@ Release:    1
 License:       LGPL v2+
 Group:         Applications
 #Source0Download: https://github.com/flatpak/flatpak/releases/
-Source0:        https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
+Source0:       https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5: 7c70a8dbf4b40abfea61574d326ab869
-Patch0:         flatpak-0.6.14-fix-gnome-software-crash.patch
-Patch1:                x32.patch
-URL:            http://flatpak.org/
+Patch0:                x32.patch
+URL:           http://flatpak.org/
 %{?with_system_bwrap:BuildRequires:    bubblewrap >= 0.1.8}
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
@@ -119,6 +118,7 @@ Bashowe uzupełnianie parametrów polecenia flatpak.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \