import flatpak-1.6.2-4.el8

SOURCES/3845.patch

@@ -0,0 +1,26 @@
+From 7ad549b89dfbfb67fd1cbbf6cafdd996e4722246 Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor@fishsoup.net>
+Date: Wed, 9 Sep 2020 16:14:57 -0400
+Subject: [PATCH] OCI: extract appstream data for runtimes
+
+Runtimes also have appstream data - with description, license information,
+and so forth, so we should extract the appstream data from the index
+for refs that start with runtime/ as well.
+---
+ common/flatpak-oci-registry.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/common/flatpak-oci-registry.c b/common/flatpak-oci-registry.c
+index cf501a5eb..0f7471129 100644
+--- a/common/flatpak-oci-registry.c
++++ b/common/flatpak-oci-registry.c
+@@ -3120,7 +3120,8 @@ add_image_to_appstream (SoupSession               *soup_session,
+     return;
+ 
+   ref_parts = g_strsplit (ref, "/", -1);
+-  if (g_strv_length (ref_parts) != 4 || strcmp (ref_parts[0], "app") != 0)
++  if (g_strv_length (ref_parts) != 4 ||
++      (strcmp (ref_parts[0], "app") != 0 && strcmp (ref_parts[0], "runtime") != 0))
+     return;
+ 
+   id = ref_parts[1];

SPECS/flatpak.spec

@@ -3,7 +3,7 @@
 
 Name:           flatpak
 Version:        1.6.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Application deployment framework for desktop apps
 
 License:        LGPLv2+
@@ -13,6 +13,9 @@ Source0:        https://github.com/flatpak/flatpak/releases/download/%{version}/
 Patch0:         flatpak-1.6.2-oci-fixes.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1847201
 Patch1:         flatpak-1.6.2-oci-fixes2.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1878231
+# https://github.com/flatpak/flatpak/pull/3845
+Patch2:         3845.patch
 
 BuildRequires:  pkgconfig(appstream-glib)
 BuildRequires:  pkgconfig(dconf)
@@ -241,6 +244,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2020 Kalev Lember <klember@redhat.com> - 1.6.2-4
+- OCI: extract appstream data for runtimes (#1878231)
+
 * Wed Jun 17 2020 David King <dking@redhat.com> - 1.6.2-3
 - Further fixes for OCI authenticator (#1847201)