21 changed files with 2749 additions and 4218 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/gnome-software-3.36.1.tar.xz
+/gnome-software-*.tar.xz
--- a/0001-Disable-build-and-use-of-help-files.patch
+++ b/0001-Disable-build-and-use-of-help-files.patch
@ -0,0 +1,123 @@
 diff -up gnome-software-47.0/meson.build.without-help gnome-software-47.0/meson.build
 --- gnome-software-47.0/meson.build.without-help	2024-09-16 12:08:30.314978903 +0200
 +++ gnome-software-47.0/meson.build	2024-09-16 12:08:44.681170496 +0200
@@ -314,7 +314,6 @@ if get_option('external_appstream')
 endif
 subdir('po')
 subdir('doc')
 -subdir('help')
 # FIXME: remove when https://github.com/mesonbuild/meson/issues/837 fixed
 meson.add_install_script('meson_post_install.sh')
 diff -up gnome-software-47.0/plugins/epiphany/gs-plugin-epiphany.c.without-help gnome-software-47.0/plugins/epiphany/gs-plugin-epiphany.c
 --- gnome-software-47.0/plugins/epiphany/gs-plugin-epiphany.c.without-help	2024-09-16 12:11:54.253698750 +0200
 +++ gnome-software-47.0/plugins/epiphany/gs-plugin-epiphany.c	2024-09-16 12:12:11.827933131 +0200
@@ -413,8 +413,6 @@ gs_epiphany_refine_app_state (GsPlugin *
 			gs_app_set_state (app, GS_APP_STATE_AVAILABLE);
 		else {
 			gs_app_set_state (app, GS_APP_STATE_UNAVAILABLE);
 -			gs_app_set_url_missing (app,
 -						"help:gnome-software/how-to-reinstall-a-web-app");
 		}
 	}
 }
 diff -up gnome-software-47.0/src/gs-age-rating-context-dialog.ui.without-help gnome-software-47.0/src/gs-age-rating-context-dialog.ui
 --- gnome-software-47.0/src/gs-age-rating-context-dialog.ui.without-help	2024-09-16 12:13:52.655277823 +0200
 +++ gnome-software-47.0/src/gs-age-rating-context-dialog.ui	2024-09-16 12:13:56.668331343 +0200
@@ -56,6 +56,8 @@
         </child>
         <child>
           <object class="AdwPreferencesGroup">
 +            <property name="visible">False</property>
 +            <property name="sensitive">False</property>
             <child>
               <object class="AdwButtonRow">
                 <property name="title" translatable="yes">_How to contribute missing information</property>
 diff -up gnome-software-47.0/src/gs-details-page.c.without-help gnome-software-47.0/src/gs-details-page.c
 --- gnome-software-47.0/src/gs-details-page.c.without-help	2024-09-16 12:22:07.020871002 +0200
 +++ gnome-software-47.0/src/gs-details-page.c	2024-09-16 12:22:56.795534829 +0200
@@ -626,27 +626,18 @@ gs_details_page_license_tile_get_involve
 			uri = gs_app_get_url (self->app, AS_URL_KIND_HOMEPAGE);
 	} else {
 		if (gs_app_get_license (self->app) == NULL) {
 -			uri = "help:gnome-software/software-metadata#license";
 +			/* would show help URI */
 		} else {
 			license_url = as_get_license_url (gs_app_get_license (self->app));
 			if (license_url != NULL && *license_url != '\0') {
 				uri = license_url;
 -			} else {
 -				/* Page to explain the differences between FOSS and proprietary
 -				 * software. This is a page on the gnome-software wiki for now,
 -				 * so that we can update the content independently of the release
 -				 * cycle. Likely, we will link to a more authoritative source
 -				 * to explain the differences.
 -				 * Ultimately, we could ship a user manual page to explain the
 -				 * differences (so that it’s available offline), but that’s too
 -				 * much work for right now. */
 -				uri = "help:gnome-software/software-licensing";
 			}
 		}
 	}
 -	gs_shell_show_uri (self->shell, uri);
 +	if (uri != NULL)
 +		gs_shell_show_uri (self->shell, uri);
 }
 static void
 diff -up gnome-software-47.0/src/gs-hardware-support-context-dialog.ui.without-help gnome-software-47.0/src/gs-hardware-support-context-dialog.ui
 --- gnome-software-47.0/src/gs-hardware-support-context-dialog.ui.without-help	2024-09-16 12:23:52.542278301 +0200
 +++ gnome-software-47.0/src/gs-hardware-support-context-dialog.ui	2024-09-16 12:24:00.332382197 +0200
@@ -58,6 +58,8 @@
         </child>
         <child>
           <object class="AdwPreferencesGroup">
 +            <property name="visible">False</property>
 +            <property name="sensitive">False</property>
             <child>
               <object class="AdwButtonRow">
                 <property name="title" translatable="yes">_How to contribute missing information</property>
 diff -up gnome-software-47.0/src/gs-license-tile.c.without-help gnome-software-47.0/src/gs-license-tile.c
 --- gnome-software-47.0/src/gs-license-tile.c.without-help	2024-09-16 12:19:52.028070653 +0200
 +++ gnome-software-47.0/src/gs-license-tile.c	2024-09-16 12:20:58.089951698 +0200
@@ -150,7 +150,7 @@ gs_license_tile_refresh (GsLicenseTile *
 		lozenge_icon_names[0] = "community-blocked-symbolic";
 		lozenge_icon_names[1] = "dialog-warning-symbolic";
 		lozenge_icon_names[2] = "software-license-symbolic";
 -		get_involved_visible = TRUE;
 +		get_involved_visible = FALSE;
 		get_involved_label = _("_Learn More");
 		if (is_application) {
@@ -168,7 +168,7 @@ gs_license_tile_refresh (GsLicenseTile *
 		lozenge_icon_names[0] = "community-blocked-symbolic";
 		lozenge_icon_names[1] = "proprietary-code-symbolic";
 		lozenge_icon_names[2] = "software-license-symbolic";
 -		get_involved_visible = TRUE;
 +		get_involved_visible = FALSE;
 		get_involved_label = _("_Learn More");
 		if (is_application) {
@@ -218,7 +218,7 @@ gs_license_tile_refresh (GsLicenseTile *
 							 license_url,
 							 license_spdx);
 		} else {
 -			get_involved_visible = TRUE;
 +			get_involved_visible = FALSE;
 			/* Translators: The placeholder here is the name of a software license. */
 			description = g_strdup_printf (_("This software is developed under the special license “%s”."
 							  "\n\n"
 diff -up gnome-software-47.0/src/gs-safety-context-dialog.ui.without-help gnome-software-47.0/src/gs-safety-context-dialog.ui
 --- gnome-software-47.0/src/gs-safety-context-dialog.ui.without-help	2024-09-16 12:24:27.198740507 +0200
 +++ gnome-software-47.0/src/gs-safety-context-dialog.ui	2024-09-16 12:25:48.974831126 +0200
@@ -121,6 +121,8 @@
         <child>
           <object class="AdwPreferencesGroup">
 +            <property name="visible">False</property>
 +            <property name="sensitive">False</property>
             <child>
               <object class="AdwButtonRow">
                 <property name="title" translatable="yes">_How to contribute missing information</property>
--- a/SOURCES/0001-Add-basic-auth-support-to-flatpak-plugin.patch
+++ b/SOURCES/0001-Add-basic-auth-support-to-flatpak-plugin.patch
@ -1,813 +0,0 @@
 From b6a41a1b9e9020a23dbc418183ebe4746b6ec027 Mon Sep 17 00:00:00 2001
 From: Kalev Lember <klember@redhat.com>
 Date: Mon, 18 May 2020 14:45:35 +0200
 Subject: [PATCH 1/2] Add basic auth support to flatpak plugin
 This is useful for e.g. OCI remotes that can use basic auth.
 All user visible strings in the basic auth dialog are taken from the
 flatpak CLI client.
 ---
 lib/gs-plugin-loader.c              |  29 +++-
 lib/gs-plugin-loader.h              |   7 +-
 lib/gs-plugin.c                     |  68 +++++++++-
 lib/gs-plugin.h                     |  13 +-
 plugins/flatpak/gs-plugin-flatpak.c |  55 +++++++-
 po/POTFILES.in                      |   2 +
 src/gnome-software.gresource.xml    |   1 +
 src/gs-basic-auth-dialog.c          | 130 ++++++++++++++++++
 src/gs-basic-auth-dialog.h          |  28 ++++
 src/gs-basic-auth-dialog.ui         | 203 ++++++++++++++++++++++++++++
 src/gs-shell.c                      |  25 +++-
 src/meson.build                     |   1 +
 12 files changed, 556 insertions(+), 6 deletions(-)
 create mode 100644 src/gs-basic-auth-dialog.c
 create mode 100644 src/gs-basic-auth-dialog.h
 create mode 100644 src/gs-basic-auth-dialog.ui
 diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
 index 979f3d5d..35382e3f 100644
 --- a/lib/gs-plugin-loader.c
 +++ b/lib/gs-plugin-loader.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
  * Copyright (C) 2007-2018 Richard Hughes <richard@hughsie.com>
 - * Copyright (C) 2014-2018 Kalev Lember <klember@redhat.com>
 + * Copyright (C) 2014-2020 Kalev Lember <klember@redhat.com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -74,6 +74,7 @@ enum {
 	SIGNAL_PENDING_APPS_CHANGED,
 	SIGNAL_UPDATES_CHANGED,
 	SIGNAL_RELOAD,
 +	SIGNAL_BASIC_AUTH_START,
 	SIGNAL_LAST
 };
@@ -2016,6 +2017,23 @@ gs_plugin_loader_status_changed_cb (GsPlugin *plugin,
 		       0, app, status);
 }
 +static void
 +gs_plugin_loader_basic_auth_start_cb (GsPlugin *plugin,
 +                                      const gchar *remote,
 +                                      const gchar *realm,
 +                                      GCallback callback,
 +                                      gpointer user_data,
 +                                      GsPluginLoader *plugin_loader)
 +{
 +	g_debug ("emitting basic-auth-start %s", realm);
 +	g_signal_emit (plugin_loader,
 +		       signals[SIGNAL_BASIC_AUTH_START], 0,
 +		       remote,
 +		       realm,
 +		       callback,
 +		       user_data);
 +}
 +
 static gboolean
 gs_plugin_loader_job_actions_changed_delay_cb (gpointer user_data)
 {
@@ -2102,6 +2120,9 @@ gs_plugin_loader_open_plugin (GsPluginLoader *plugin_loader,
 	g_signal_connect (plugin, "status-changed",
 			  G_CALLBACK (gs_plugin_loader_status_changed_cb),
 			  plugin_loader);
 +	g_signal_connect (plugin, "basic-auth-start",
 +			  G_CALLBACK (gs_plugin_loader_basic_auth_start_cb),
 +			  plugin_loader);
 	g_signal_connect (plugin, "report-event",
 			  G_CALLBACK (gs_plugin_loader_report_event_cb),
 			  plugin_loader);
@@ -2712,6 +2733,12 @@ gs_plugin_loader_class_init (GsPluginLoaderClass *klass)
 			      G_STRUCT_OFFSET (GsPluginLoaderClass, reload),
 			      NULL, NULL, g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 +	signals [SIGNAL_BASIC_AUTH_START] =
 +		g_signal_new ("basic-auth-start",
 +			      G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
 +			      G_STRUCT_OFFSET (GsPluginLoaderClass, basic_auth_start),
 +			      NULL, NULL, g_cclosure_marshal_generic,
 +			      G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
 }
 static void
 diff --git a/lib/gs-plugin-loader.h b/lib/gs-plugin-loader.h
 index 74cbfa53..e88ea2d1 100644
 --- a/lib/gs-plugin-loader.h
 +++ b/lib/gs-plugin-loader.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
  * Copyright (C) 2007-2017 Richard Hughes <richard@hughsie.com>
 - * Copyright (C) 2015 Kalev Lember <klember@redhat.com>
 + * Copyright (C) 2015-2020 Kalev Lember <klember@redhat.com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -31,6 +31,11 @@ struct _GsPluginLoaderClass
 	void			(*pending_apps_changed)	(GsPluginLoader	*plugin_loader);
 	void			(*updates_changed)	(GsPluginLoader	*plugin_loader);
 	void			(*reload)		(GsPluginLoader	*plugin_loader);
 +	void			(*basic_auth_start)	(GsPluginLoader	*plugin_loader,
 +							 const gchar	*remote,
 +							 const gchar	*realm,
 +							 GCallback	 callback,
 +							 gpointer	 user_data);
 };
 GsPluginLoader	*gs_plugin_loader_new			(void);
 diff --git a/lib/gs-plugin.c b/lib/gs-plugin.c
 index 5aed1058..3f63fa97 100644
 --- a/lib/gs-plugin.c
 +++ b/lib/gs-plugin.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
  * Copyright (C) 2013-2016 Richard Hughes <richard@hughsie.com>
 - * Copyright (C) 2014-2018 Kalev Lember <klember@redhat.com>
 + * Copyright (C) 2014-2020 Kalev Lember <klember@redhat.com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -87,6 +87,7 @@ enum {
 	SIGNAL_RELOAD,
 	SIGNAL_REPORT_EVENT,
 	SIGNAL_ALLOW_UPDATES,
 +	SIGNAL_BASIC_AUTH_START,
 	SIGNAL_LAST
 };
@@ -851,6 +852,64 @@ gs_plugin_status_update (GsPlugin *plugin, GsApp *app, GsPluginStatus status)
 	g_source_attach (idle_source, NULL);
 }
 +typedef struct {
 +	GsPlugin	*plugin;
 +	gchar		*remote;
 +	gchar		*realm;
 +	GCallback	 callback;
 +	gpointer	 user_data;
 +} GsPluginBasicAuthHelper;
 +
 +static gboolean
 +gs_plugin_basic_auth_start_cb (gpointer user_data)
 +{
 +	GsPluginBasicAuthHelper *helper = user_data;
 +	g_signal_emit (helper->plugin,
 +		       signals[SIGNAL_BASIC_AUTH_START], 0,
 +		       helper->remote,
 +		       helper->realm,
 +		       helper->callback,
 +		       helper->user_data);
 +	g_free (helper->remote);
 +	g_free (helper->realm);
 +	g_slice_free (GsPluginBasicAuthHelper, helper);
 +	return FALSE;
 +}
 +
 +/**
 + * gs_plugin_basic_auth_start:
 + * @plugin: a #GsPlugin
 + * @remote: a string
 + * @realm: a string
 + * @callback: callback to invoke to submit the user/password
 + * @user_data: callback data to pass to the callback
 + *
 + * Emit the basic-auth-start signal in the main thread.
 + *
 + * Since: 3.38
 + **/
 +void
 +gs_plugin_basic_auth_start (GsPlugin *plugin,
 +                            const gchar *remote,
 +                            const gchar *realm,
 +                            GCallback callback,
 +                            gpointer user_data)
 +{
 +	GsPluginBasicAuthHelper *helper;
 +	g_autoptr(GSource) idle_source = NULL;
 +
 +	helper = g_slice_new0 (GsPluginBasicAuthHelper);
 +	helper->plugin = plugin;
 +	helper->remote = g_strdup (remote);
 +	helper->realm = g_strdup (realm);
 +	helper->callback = callback;
 +	helper->user_data = user_data;
 +
 +	idle_source = g_idle_source_new ();
 +	g_source_set_callback (idle_source, gs_plugin_basic_auth_start_cb, helper, NULL);
 +	g_source_attach (idle_source, NULL);
 +}
 +
 static gboolean
 gs_plugin_app_launch_cb (gpointer user_data)
 {
@@ -1959,6 +2018,13 @@ gs_plugin_class_init (GsPluginClass *klass)
 			      G_STRUCT_OFFSET (GsPluginClass, allow_updates),
 			      NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
 			      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 +
 +	signals [SIGNAL_BASIC_AUTH_START] =
 +		g_signal_new ("basic-auth-start",
 +			      G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
 +			      G_STRUCT_OFFSET (GsPluginClass, basic_auth_start),
 +			      NULL, NULL, g_cclosure_marshal_generic,
 +			      G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
 }
 static void
 diff --git a/lib/gs-plugin.h b/lib/gs-plugin.h
 index 7dd2d864..d07afd3b 100644
 --- a/lib/gs-plugin.h
 +++ b/lib/gs-plugin.h
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
  * Copyright (C) 2012-2016 Richard Hughes <richard@hughsie.com>
 + * Copyright (C) 2020 Kalev Lember <klember@redhat.com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -37,7 +38,12 @@ struct _GsPluginClass
 							 GsPluginEvent	*event);
 	void			(*allow_updates)	(GsPlugin	*plugin,
 							 gboolean	 allow_updates);
 -	gpointer		 padding[26];
 +	void			(*basic_auth_start)	(GsPlugin	*plugin,
 +							 const gchar	*remote,
 +							 const gchar	*realm,
 +							 GCallback	 callback,
 +							 gpointer	 user_data);
 +	gpointer		 padding[25];
 };
 typedef struct	GsPluginData	GsPluginData;
@@ -116,5 +122,10 @@ void		 gs_plugin_report_event			(GsPlugin	*plugin,
 void		 gs_plugin_set_allow_updates		(GsPlugin	*plugin,
 							 gboolean	 allow_updates);
 gboolean	 gs_plugin_get_network_available	(GsPlugin	*plugin);
 +void		 gs_plugin_basic_auth_start		(GsPlugin	*plugin,
 +							 const gchar	*remote,
 +							 const gchar	*realm,
 +							 GCallback	 callback,
 +							 gpointer	 user_data);
 G_END_DECLS
 diff --git a/plugins/flatpak/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c
 index 4d6a81ba..2518025d 100644
 --- a/plugins/flatpak/gs-plugin-flatpak.c
 +++ b/plugins/flatpak/gs-plugin-flatpak.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2016 Joaquim Rocha <jrocha@endlessm.com>
  * Copyright (C) 2016-2018 Richard Hughes <richard@hughsie.com>
 - * Copyright (C) 2017-2018 Kalev Lember <klember@redhat.com>
 + * Copyright (C) 2017-2020 Kalev Lember <klember@redhat.com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -456,6 +456,55 @@ _group_apps_by_installation (GsPlugin *plugin,
 	return g_steal_pointer (&applist_by_flatpaks);
 }
 +#if FLATPAK_CHECK_VERSION(1,6,0)
 +typedef struct {
 +	FlatpakTransaction *transaction;
 +	guint id;
 +} BasicAuthData;
 +
 +static void
 +basic_auth_data_free (BasicAuthData *data)
 +{
 +	g_object_unref (data->transaction);
 +	g_slice_free (BasicAuthData, data);
 +}
 +
 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(BasicAuthData, basic_auth_data_free)
 +
 +static void
 +_basic_auth_cb (const gchar *user, const gchar *password, gpointer user_data)
 +{
 +	g_autoptr(BasicAuthData) data = user_data;
 +
 +	g_debug ("Submitting basic auth data");
 +
 +	/* NULL user aborts the basic auth request */
 +	flatpak_transaction_complete_basic_auth (data->transaction, data->id, user, password, NULL /* options */);
 +}
 +
 +static gboolean
 +_basic_auth_start (FlatpakTransaction *transaction,
 +                   const char *remote,
 +                   const char *realm,
 +                   GVariant *options,
 +                   guint id,
 +                   GsPlugin *plugin)
 +{
 +	BasicAuthData *data;
 +
 +	if (!gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE))
 +		return FALSE;
 +
 +	data = g_slice_new0 (BasicAuthData);
 +	data->transaction = g_object_ref (transaction);
 +	data->id = id;
 +
 +	g_debug ("Login required remote %s (realm %s)\n", remote, realm);
 +	gs_plugin_basic_auth_start (plugin, remote, realm, G_CALLBACK (_basic_auth_cb), data);
 +	return TRUE;
 +}
 +#endif
 +
 static FlatpakTransaction *
 _build_transaction (GsPlugin *plugin, GsFlatpak *flatpak,
 		    GCancellable *cancellable, GError **error)
@@ -491,6 +540,10 @@ _build_transaction (GsPlugin *plugin, GsFlatpak *flatpak,
 	/* connect up signals */
 	g_signal_connect (transaction, "ref-to-app",
 			  G_CALLBACK (_ref_to_app), plugin);
 +#if FLATPAK_CHECK_VERSION(1,6,0)
 +	g_signal_connect (transaction, "basic-auth-start",
 +			  G_CALLBACK (_basic_auth_start), plugin);
 +#endif
 	/* use system installations as dependency sources for user installations */
 	flatpak_transaction_add_default_dependency_sources (transaction);
 diff --git a/po/POTFILES.in b/po/POTFILES.in
 index 20721c4a..a44a6ad3 100644
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
@@ -10,6 +10,8 @@ src/gs-app-row.c
 src/gs-app-row.ui
 src/gs-app-tile.c
 src/gs-app-tile.ui
 +src/gs-basic-auth-dialog.c
 +src/gs-basic-auth-dialog.ui
 lib/gs-category.c
 src/gs-category-page.c
 src/gs-category-page.ui
 diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
 index 3eaabca2..459ecf82 100644
 --- a/src/gnome-software.gresource.xml
 +++ b/src/gnome-software.gresource.xml
@@ -4,6 +4,7 @@
   <file preprocess="xml-stripblanks">gnome-software.ui</file>
   <file preprocess="xml-stripblanks">gs-app-addon-row.ui</file>
   <file preprocess="xml-stripblanks">gs-app-row.ui</file>
 +  <file preprocess="xml-stripblanks">gs-basic-auth-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-category-page.ui</file>
   <file preprocess="xml-stripblanks">gs-category-tile.ui</file>
   <file preprocess="xml-stripblanks">gs-details-page.ui</file>
 diff --git a/src/gs-basic-auth-dialog.c b/src/gs-basic-auth-dialog.c
 new file mode 100644
 index 00000000..c690a327
 --- /dev/null
 +++ b/src/gs-basic-auth-dialog.c
@@ -0,0 +1,130 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2020 Kalev Lember <klember@redhat.com>
 + *
 + * SPDX-License-Identifier: GPL-2.0+
 + */
 +
 +#include "config.h"
 +
 +#include "gs-basic-auth-dialog.h"
 +
 +#include <glib.h>
 +#include <glib/gi18n.h>
 +#include <gtk/gtk.h>
 +
 +struct _GsBasicAuthDialog
 +{
 +	GtkDialog		 parent_instance;
 +
 +	GsBasicAuthCallback	 callback;
 +	gpointer		 callback_data;
 +
 +	/* template widgets */
 +	GtkButton		*login_button;
 +	GtkLabel		*description_label;
 +	GtkEntry		*user_entry;
 +	GtkEntry		*password_entry;
 +};
 +
 +G_DEFINE_TYPE (GsBasicAuthDialog, gs_basic_auth_dialog, GTK_TYPE_DIALOG)
 +
 +static void
 +cancel_button_clicked_cb (GsBasicAuthDialog *dialog)
 +{
 +	/* abort the basic auth request */
 +	dialog->callback (NULL, NULL, dialog->callback_data);
 +
 +	gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 +}
 +
 +static void
 +login_button_clicked_cb (GsBasicAuthDialog *dialog)
 +{
 +	const gchar *user;
 +	const gchar *password;
 +
 +	user = gtk_entry_get_text (dialog->user_entry);
 +	password = gtk_entry_get_text (dialog->password_entry);
 +
 +	/* submit the user/password to basic auth */
 +	dialog->callback (user, password, dialog->callback_data);
 +
 +	gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 +}
 +
 +static void
 +dialog_validate (GsBasicAuthDialog *dialog)
 +{
 +	const gchar *user;
 +	const gchar *password;
 +	gboolean valid_user;
 +	gboolean valid_password;
 +
 +	/* require user */
 +	user = gtk_entry_get_text (dialog->user_entry);
 +	valid_user = user != NULL && strlen (user) != 0;
 +
 +	/* require password */
 +	password = gtk_entry_get_text (dialog->password_entry);
 +	valid_password = password != NULL && strlen (password) != 0;
 +
 +	gtk_widget_set_sensitive (GTK_WIDGET (dialog->login_button), valid_user && valid_password);
 +}
 +
 +static void
 +update_description (GsBasicAuthDialog *dialog, const gchar *remote, const gchar *realm)
 +{
 +	g_autofree gchar *description = NULL;
 +
 +	/* TRANSLATORS: This is a description for entering user/password */
 +	description = g_strdup_printf (_("Login required remote %s (realm %s)"),
 +				       remote, realm);
 +	gtk_label_set_text (dialog->description_label, description);
 +}
 +
 +static void
 +gs_basic_auth_dialog_init (GsBasicAuthDialog *dialog)
 +{
 +	gtk_widget_init_template (GTK_WIDGET (dialog));
 +}
 +
 +static void
 +gs_basic_auth_dialog_class_init (GsBasicAuthDialogClass *klass)
 +{
 +	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 +
 +	gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-basic-auth-dialog.ui");
 +
 +	gtk_widget_class_bind_template_child (widget_class, GsBasicAuthDialog, login_button);
 +	gtk_widget_class_bind_template_child (widget_class, GsBasicAuthDialog, description_label);
 +	gtk_widget_class_bind_template_child (widget_class, GsBasicAuthDialog, user_entry);
 +	gtk_widget_class_bind_template_child (widget_class, GsBasicAuthDialog, password_entry);
 +
 +	gtk_widget_class_bind_template_callback (widget_class, dialog_validate);
 +	gtk_widget_class_bind_template_callback (widget_class, cancel_button_clicked_cb);
 +	gtk_widget_class_bind_template_callback (widget_class, login_button_clicked_cb);
 +}
 +
 +GtkWidget *
 +gs_basic_auth_dialog_new (GtkWindow *parent,
 +                          const gchar *remote,
 +                          const gchar *realm,
 +                          GsBasicAuthCallback callback,
 +                          gpointer callback_data)
 +{
 +	GsBasicAuthDialog *dialog;
 +
 +	dialog = g_object_new (GS_TYPE_BASIC_AUTH_DIALOG,
 +	                       "use-header-bar", TRUE,
 +	                       "transient-for", parent,
 +	                       "modal", TRUE,
 +	                       NULL);
 +	dialog->callback = callback;
 +	dialog->callback_data = callback_data;
 +
 +	update_description (dialog, remote, realm);
 +	dialog_validate (dialog);
 +
 +	return GTK_WIDGET (dialog);
 +}
 diff --git a/src/gs-basic-auth-dialog.h b/src/gs-basic-auth-dialog.h
 new file mode 100644
 index 00000000..ec5f1d03
 --- /dev/null
 +++ b/src/gs-basic-auth-dialog.h
@@ -0,0 +1,28 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2020 Kalev Lember <klember@redhat.com>
 + *
 + * SPDX-License-Identifier: GPL-2.0+
 + */
 +
 +#pragma once
 +
 +#include <gtk/gtk.h>
 +
 +#include "gnome-software-private.h"
 +
 +G_BEGIN_DECLS
 +
 +typedef void (*GsBasicAuthCallback) (const gchar *user, const gchar *password, gpointer callback_data);
 +
 +#define GS_TYPE_BASIC_AUTH_DIALOG (gs_basic_auth_dialog_get_type ())
 +
 +G_DECLARE_FINAL_TYPE (GsBasicAuthDialog, gs_basic_auth_dialog, GS, BASIC_AUTH_DIALOG, GtkDialog)
 +
 +GtkWidget	*gs_basic_auth_dialog_new		(GtkWindow		*parent,
 +							 const gchar		*remote,
 +							 const gchar		*realm,
 +							 GsBasicAuthCallback	 callback,
 +							 gpointer		 callback_data);
 +
 +G_END_DECLS
 diff --git a/src/gs-basic-auth-dialog.ui b/src/gs-basic-auth-dialog.ui
 new file mode 100644
 index 00000000..339e831d
 --- /dev/null
 +++ b/src/gs-basic-auth-dialog.ui
@@ -0,0 +1,203 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<interface>
 +  <template class="GsBasicAuthDialog" parent="GtkDialog">
 +    <property name="can_focus">False</property>
 +    <property name="border_width">5</property>
 +    <property name="resizable">False</property>
 +    <property name="modal">True</property>
 +    <property name="destroy_with_parent">True</property>
 +    <property name="type_hint">dialog</property>
 +    <property name="title" translatable="yes">Login Required</property>
 +    <property name="use_header_bar">1</property>
 +    <child internal-child="headerbar">
 +      <object class="GtkHeaderBar">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
 +        <property name="show_close_button">False</property>
 +        <child>
 +          <object class="GtkButton" id="cancel_button">
 +            <property name="label" translatable="yes">_Cancel</property>
 +            <property name="visible">True</property>
 +            <property name="visible">True</property>
 +            <property name="can_focus">True</property>
 +            <property name="can_default">True</property>
 +            <property name="receives_default">True</property>
 +            <property name="use_action_appearance">False</property>
 +            <property name="use_underline">True</property>
 +            <property name="valign">center</property>
 +            <signal name="clicked" handler="cancel_button_clicked_cb" object="GsBasicAuthDialog" swapped="yes"/>
 +            <style>
 +              <class name="text-button"/>
 +            </style>
 +          </object>
 +          <packing>
 +            <property name="pack_type">start</property>
 +          </packing>
 +        </child>
 +        <child>
 +          <object class="GtkButton" id="login_button">
 +            <property name="label" translatable="yes">_Login</property>
 +            <property name="visible">True</property>
 +            <property name="can_focus">True</property>
 +            <property name="can_default">True</property>
 +            <property name="has_default">True</property>
 +            <property name="receives_default">True</property>
 +            <property name="use_action_appearance">False</property>
 +            <property name="use_underline">True</property>
 +            <property name="valign">center</property>
 +            <signal name="clicked" handler="login_button_clicked_cb" object="GsBasicAuthDialog" swapped="yes"/>
 +            <style>
 +              <class name="text-button"/>
 +              <class name="suggested-action"/>
 +            </style>
 +          </object>
 +          <packing>
 +            <property name="pack_type">end</property>
 +          </packing>
 +        </child>
 +      </object>
 +    </child>
 +    <child internal-child="vbox">
 +      <object class="GtkBox">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
 +        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkGrid">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
 +            <property name="hexpand">True</property>
 +            <property name="row_spacing">8</property>
 +            <property name="column_spacing">6</property>
 +            <property name="border_width">20</property>
 +            <property name="margin_end">20</property>
 +            <child>
 +              <object class="GtkLabel" id="description_label">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
 +                <property name="wrap">True</property>
 +                <property name="wrap_mode">word-char</property>
 +                <property name="margin_bottom">20</property>
 +                <property name="max_width_chars">55</property>
 +                <property name="xalign">0</property>
 +                <style>
 +                  <class name="dim-label"/>
 +                </style>
 +              </object>
 +              <packing>
 +                <property name="left_attach">0</property>
 +                <property name="top_attach">0</property>
 +                <property name="width">2</property>
 +                <property name="height">1</property>
 +              </packing>
 +            </child>
 +            <child>
 +              <object class="GtkLabel" id="user_label">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
 +                <property name="xalign">1</property>
 +                <property name="label" translatable="yes">_User</property>
 +                <property name="use_underline">True</property>
 +                <property name="mnemonic_widget">user_entry</property>
 +                <property name="margin_start">20</property>
 +                <style>
 +                  <class name="dim-label"/>
 +                </style>
 +              </object>
 +              <packing>
 +                <property name="left_attach">0</property>
 +                <property name="top_attach">3</property>
 +                <property name="width">1</property>
 +                <property name="height">1</property>
 +              </packing>
 +            </child>
 +            <child>
 +              <object class="GtkLabel" id="password_label">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
 +                <property name="xalign">1</property>
 +                <property name="label" translatable="yes">_Password</property>
 +                <property name="use_underline">True</property>
 +                <property name="mnemonic_widget">password_entry</property>
 +                <property name="margin_start">20</property>
 +                <style>
 +                  <class name="dim-label"/>
 +                </style>
 +              </object>
 +              <packing>
 +                <property name="left_attach">0</property>
 +                <property name="top_attach">4</property>
 +                <property name="width">1</property>
 +                <property name="height">1</property>
 +              </packing>
 +            </child>
 +            <child>
 +              <object class="GtkEntry" id="user_entry">
 +                <property name="visible">True</property>
 +                <property name="can_focus">True</property>
 +                <property name="has_focus">True</property>
 +                <property name="hexpand">True</property>
 +                <property name="invisible_char">●</property>
 +                <property name="activates_default">True</property>
 +                <property name="invisible_char_set">True</property>
 +                <property name="input_purpose">password</property>
 +                <signal name="changed" handler="dialog_validate" object="GsBasicAuthDialog" swapped="yes"/>
 +                <signal name="activate" handler="dialog_validate" object="GsBasicAuthDialog" swapped="yes"/>
 +              </object>
 +              <packing>
 +                <property name="left_attach">1</property>
 +                <property name="top_attach">3</property>
 +                <property name="width">1</property>
 +                <property name="height">1</property>
 +              </packing>
 +            </child>
 +            <child>
 +              <object class="GtkEntry" id="password_entry">
 +                <property name="visible">True</property>
 +                <property name="can_focus">True</property>
 +                <property name="hexpand">True</property>
 +                <property name="visibility">False</property>
 +                <property name="invisible_char">●</property>
 +                <property name="activates_default">True</property>
 +                <property name="invisible_char_set">True</property>
 +                <property name="input_purpose">password</property>
 +                <signal name="changed" handler="dialog_validate" object="GsBasicAuthDialog" swapped="yes"/>
 +                <signal name="activate" handler="dialog_validate" object="GsBasicAuthDialog" swapped="yes"/>
 +              </object>
 +              <packing>
 +                <property name="left_attach">1</property>
 +                <property name="top_attach">4</property>
 +                <property name="width">1</property>
 +                <property name="height">1</property>
 +              </packing>
 +            </child>
 +          </object>
 +          <packing>
 +            <property name="expand">False</property>
 +            <property name="fill">True</property>
 +            <property name="position">0</property>
 +          </packing>
 +        </child>
 +      </object>
 +    </child>
 +  </template>
 +  <object class="GtkSizeGroup">
 +    <widgets>
 +      <widget name="user_label"/>
 +      <widget name="password_label"/>
 +    </widgets>
 +  </object>
 +  <object class="GtkSizeGroup">
 +    <widgets>
 +      <widget name="user_entry"/>
 +      <widget name="password_entry"/>
 +    </widgets>
 +  </object>
 +  <object class="GtkSizeGroup">
 +    <property name="mode">horizontal</property>
 +    <widgets>
 +      <widget name="login_button"/>
 +      <widget name="cancel_button"/>
 +    </widgets>
 +  </object>
 +</interface>
 diff --git a/src/gs-shell.c b/src/gs-shell.c
 index 009776ad..41503cf8 100644
 --- a/src/gs-shell.c
 +++ b/src/gs-shell.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2013-2017 Richard Hughes <richard@hughsie.com>
  * Copyright (C) 2013 Matthias Clasen <mclasen@redhat.com>
 - * Copyright (C) 2014-2018 Kalev Lember <klember@redhat.com>
 + * Copyright (C) 2014-2020 Kalev Lember <klember@redhat.com>
  *
  * SPDX-License-Identifier: GPL-2.0+
  */
@@ -18,6 +18,7 @@
 #include "gs-common.h"
 #include "gs-shell.h"
 +#include "gs-basic-auth-dialog.h"
 #include "gs-details-page.h"
 #include "gs-installed-page.h"
 #include "gs-metered-data-dialog.h"
@@ -362,6 +363,25 @@ scheduler_ready_cb (GObject *source_object,
 }
 #endif  /* HAVE_MOGWAI */
 +static void
 +gs_shell_basic_auth_start_cb (GsPluginLoader *plugin_loader,
 +                              const gchar *remote,
 +                              const gchar *realm,
 +                              GsBasicAuthCallback callback,
 +                              gpointer callback_data,
 +                              GsShell *shell)
 +{
 +	GsShellPrivate *priv = gs_shell_get_instance_private (shell);
 +	GtkWidget *dialog;
 +
 +	dialog = gs_basic_auth_dialog_new (priv->main_window, remote, realm, callback, callback_data);
 +	gs_shell_modal_dialog_present (shell, GTK_DIALOG (dialog));
 +
 +	/* just destroy */
 +	g_signal_connect_swapped (dialog, "response",
 +				  G_CALLBACK (gtk_widget_destroy), dialog);
 +}
 +
 static void
 free_back_entry (BackEntry *entry)
 {
@@ -2126,6 +2146,9 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
 	g_signal_connect_object (priv->plugin_loader, "notify::network-metered",
 				 G_CALLBACK (gs_shell_network_metered_notify_cb),
 				 shell, 0);
 +	g_signal_connect_object (priv->plugin_loader, "basic-auth-start",
 +				 G_CALLBACK (gs_shell_basic_auth_start_cb),
 +				 shell, 0);
 	priv->cancellable = g_object_ref (cancellable);
 	priv->settings = g_settings_new ("org.gnome.software");
 diff --git a/src/meson.build b/src/meson.build
 index cbd0a511..6581e77c 100644
 --- a/src/meson.build
 +++ b/src/meson.build
@@ -20,6 +20,7 @@ gnome_software_sources = [
   'gs-application.c',
   'gs-app-row.c',
   'gs-app-tile.c',
 +  'gs-basic-auth-dialog.c',
   'gs-category-page.c',
   'gs-category-tile.c',
   'gs-common.c',
 -- 
 2.26.2
--- a/SOURCES/0001-Fix-hardcoded-desktop-and-appdata-names-to-match-wha.patch
+++ b/SOURCES/0001-Fix-hardcoded-desktop-and-appdata-names-to-match-wha.patch
@ -1,61 +0,0 @@
 From 9dce785c2a71e81c410c6e314dd4d4db6cc02808 Mon Sep 17 00:00:00 2001
 From: Kalev Lember <klember@redhat.com>
 Date: Wed, 3 Jun 2020 16:35:03 +0200
 Subject: [PATCH] Fix hardcoded desktop and appdata names to match what's in
 RHEL 8.3
 ---
 data/assets/org.gnome.Software.Featured.xml | 2 +-
 plugins/core/gs-plugin-hardcoded-popular.c  | 2 +-
 src/gs-folders.c                            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 diff --git a/data/assets/org.gnome.Software.Featured.xml b/data/assets/org.gnome.Software.Featured.xml
 index d1d920be..822fc6a9 100644
 --- a/data/assets/org.gnome.Software.Featured.xml
 +++ b/data/assets/org.gnome.Software.Featured.xml
@@ -145,7 +145,7 @@ text-shadow: none;</value>
     </custom>
   </component>
   <component merge="append">
 -    <id>org.gimp.GIMP</id>
 +    <id>gimp.desktop</id>
     <custom>
       <value key="GnomeSoftware::FeatureTile-css">border-color: #4a8c30;
 text-shadow: none;
 diff --git a/plugins/core/gs-plugin-hardcoded-popular.c b/plugins/core/gs-plugin-hardcoded-popular.c
 index 3998a813..03b44475 100644
 --- a/plugins/core/gs-plugin-hardcoded-popular.c
 +++ b/plugins/core/gs-plugin-hardcoded-popular.c
@@ -29,7 +29,7 @@ gs_plugin_add_popular (GsPlugin *plugin,
 		"org.gnome.clocks.desktop",
 		"org.gnome.Dictionary.desktop",
 		"org.gnome.Documents.desktop",
 -		"org.gnome.Evince",
 +		"evince.desktop",
 		"org.gnome.gedit.desktop",
 		"org.gnome.Maps.desktop",
 		"org.gnome.Weather",
 diff --git a/src/gs-folders.c b/src/gs-folders.c
 index fa068f0e..589cc1e2 100644
 --- a/src/gs-folders.c
 +++ b/src/gs-folders.c
@@ -560,12 +560,12 @@ gs_folders_convert (void)
 			"org.gnome.DejaDup.desktop",
 			"org.gnome.Dictionary.desktop",
 			"org.gnome.DiskUtility.desktop",
 -			"org.gnome.eog.desktop",
 -			"org.gnome.Evince.desktop",
 +			"eog.desktop",
 +			"evince.desktop",
 			"org.gnome.FileRoller.desktop",
 			"org.gnome.fonts.desktop",
 			"org.gnome.Screenshot.desktop",
 -			"org.gnome.seahorse.Application.desktop",
 +			"seahorse.desktop",
 			"org.gnome.Terminal.desktop",
 			"org.gnome.tweaks.desktop",
 			"org.gnome.Usage.desktop",
 -- 
 2.18.2
--- a/SOURCES/0001-Improve-the-heuristic-for-detecting-old-style-AppStr.patch
+++ b/SOURCES/0001-Improve-the-heuristic-for-detecting-old-style-AppStr.patch
@ -1,69 +0,0 @@
 From bc31889bf90e14776e4404cd58e9b0244efc4f2e Mon Sep 17 00:00:00 2001
 From: Kalev Lember <klember@redhat.com>
 Date: Tue, 9 Jun 2020 21:42:41 +0200
 Subject: [PATCH] Improve the heuristic for detecting old-style AppStream
 override files
 The heuristic was trying to detect old-style AppStream override files
 that have the following structure:
      <component type=desktop>
        <id>org.kde.amarok.desktop</id>
        <categories>
          <category>AudioVideo</category>
          <category>Featured</category>
        </categories>
      </component>
 When it found one, it gave it the wildcard quirk to avoid leaking the
 result to the installed apps list.
 This however incorrectly tripped on old appdata files that didn't
 specify name and relied on filling the missing name/summary/icon from
 the desktop file.
 Fix this by tightening the heuristic and also look for
 <metadata_license> that none of the override files should have.
 This fixes RHEL firefox package to correctly show up when clicking on
 'Show Details' in GNOME Shell.
 ---
 plugins/core/gs-appstream.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
 diff --git a/plugins/core/gs-appstream.c b/plugins/core/gs-appstream.c
 index a387f2e0..da9ba970 100644
 --- a/plugins/core/gs-appstream.c
 +++ b/plugins/core/gs-appstream.c
@@ -746,6 +746,13 @@ gs_appstream_refine_app (GsPlugin *plugin,
 			gs_app_remove_quirk (app, GS_APP_QUIRK_HIDE_EVERYWHERE);
 	}
 +	/* try to detect old-style AppStream 'override'
 +	 * files without the merge attribute */
 +	if (xb_node_query_text (component, "name", NULL) == NULL &&
 +	    xb_node_query_text (component, "metadata_license", NULL) == NULL) {
 +		gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
 +	}
 +
 	/* set id */
 	tmp = xb_node_query_text (component, "id", NULL);
 	if (tmp != NULL && gs_app_get_id (app) == NULL)
@@ -770,13 +777,8 @@ gs_appstream_refine_app (GsPlugin *plugin,
 	/* set name */
 	tmp = xb_node_query_text (component, "name", NULL);
 -	if (tmp != NULL) {
 +	if (tmp != NULL)
 		gs_app_set_name (app, GS_APP_QUALITY_HIGHEST, tmp);
 -	} else {
 -		/* this is a heuristic, but works even with old-style AppStream
 -		 * files without the merge attribute */
 -		gs_app_add_quirk (app, GS_APP_QUIRK_IS_WILDCARD);
 -	}
 	/* set summary */
 	tmp = xb_node_query_text (component, "summary", NULL);
 -- 
 2.26.2
--- a/SOURCES/0002-Add-webflow-auth-support-to-flatpak-plugin.patch
+++ b/SOURCES/0002-Add-webflow-auth-support-to-flatpak-plugin.patch
@ -1,104 +0,0 @@
 From de3afc6463aeb0e2d637a0360d1b96acffdf4e6d Mon Sep 17 00:00:00 2001
 From: Kalev Lember <klember@redhat.com>
 Date: Tue, 19 May 2020 14:28:10 +0200
 Subject: [PATCH 2/2] Add webflow auth support to flatpak plugin
 This is just the minimal support, launching the auth page in the default
 web browser when libflatpak signals that we need to do the webflow auth.
 Possible improvements could include doing either a webkitgtk dialog, or
 maybe asking for confirmation before launching the web browser.
 ---
 plugins/flatpak/gs-plugin-flatpak.c | 69 +++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 diff --git a/plugins/flatpak/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c
 index 2518025d..a453cec8 100644
 --- a/plugins/flatpak/gs-plugin-flatpak.c
 +++ b/plugins/flatpak/gs-plugin-flatpak.c
@@ -503,6 +503,71 @@ _basic_auth_start (FlatpakTransaction *transaction,
 	gs_plugin_basic_auth_start (plugin, remote, realm, G_CALLBACK (_basic_auth_cb), data);
 	return TRUE;
 }
 +
 +static gboolean
 +_webflow_start (FlatpakTransaction *transaction,
 +                const char *remote,
 +                const char *url,
 +                GVariant *options,
 +                guint id,
 +                GsPlugin *plugin)
 +{
 +	const char *browser;
 +	g_autoptr(GError) error_local = NULL;
 +
 +	if (!gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE))
 +		return FALSE;
 +
 +	g_debug ("Authentication required for remote '%s'", remote);
 +
 +	/* Allow hard overrides with $BROWSER */
 +	browser = g_getenv ("BROWSER");
 +	if (browser != NULL) {
 +		const char *args[3] = { NULL, url, NULL };
 +		args[0] = browser;
 +		if (!g_spawn_async (NULL, (char **)args, NULL, G_SPAWN_SEARCH_PATH,
 +		                    NULL, NULL, NULL, &error_local)) {
 +			g_autoptr(GsPluginEvent) event = NULL;
 +
 +			g_warning ("Failed to start browser %s: %s", browser, error_local->message);
 +
 +			event = gs_plugin_event_new ();
 +			gs_flatpak_error_convert (&error_local);
 +			gs_plugin_event_set_error (event, error_local);
 +			gs_plugin_event_add_flag (event, GS_PLUGIN_EVENT_FLAG_WARNING);
 +			gs_plugin_report_event (plugin, event);
 +
 +			return FALSE;
 +		}
 +	} else {
 +		if (!g_app_info_launch_default_for_uri (url, NULL, &error_local)) {
 +			g_autoptr(GsPluginEvent) event = NULL;
 +
 +			g_warning ("Failed to show url: %s", error_local->message);
 +
 +			event = gs_plugin_event_new ();
 +			gs_flatpak_error_convert (&error_local);
 +			gs_plugin_event_set_error (event, error_local);
 +			gs_plugin_event_add_flag (event, GS_PLUGIN_EVENT_FLAG_WARNING);
 +			gs_plugin_report_event (plugin, event);
 +
 +			return FALSE;
 +		}
 +	}
 +
 +	g_debug ("Waiting for browser...");
 +
 +	return TRUE;
 +}
 +
 +static void
 +_webflow_done (FlatpakTransaction *transaction,
 +               GVariant *options,
 +               guint id,
 +               GsPlugin *plugin)
 +{
 +	g_debug ("Browser done");
 +}
 #endif
 static FlatpakTransaction *
@@ -543,6 +608,10 @@ _build_transaction (GsPlugin *plugin, GsFlatpak *flatpak,
 #if FLATPAK_CHECK_VERSION(1,6,0)
 	g_signal_connect (transaction, "basic-auth-start",
 			  G_CALLBACK (_basic_auth_start), plugin);
 +	g_signal_connect (transaction, "webflow-start",
 +			  G_CALLBACK (_webflow_start), plugin);
 +	g_signal_connect (transaction, "webflow-done",
 +			  G_CALLBACK (_webflow_done), plugin);
 #endif
 	/* use system installations as dependency sources for user installations */
 -- 
 2.26.2
--- a/SOURCES/0003-hide-some-errors.patch
+++ b/SOURCES/0003-hide-some-errors.patch
@ -1,61 +0,0 @@
 diff -up gnome-software-3.36.1/lib/gs-plugin-loader.c.12 gnome-software-3.36.1/lib/gs-plugin-loader.c
 --- gnome-software-3.36.1/lib/gs-plugin-loader.c.12	2022-09-22 12:17:59.367881179 +0200
 +++ gnome-software-3.36.1/lib/gs-plugin-loader.c	2022-09-22 12:17:59.392881205 +0200
@@ -333,10 +333,17 @@ gs_plugin_job_to_failed_event (GsPluginJ
 	/* invalid */
 	if (error->domain != GS_PLUGIN_ERROR) {
 -		g_warning ("not GsPlugin error %s:%i: %s",
 -			   g_quark_to_string (error->domain),
 -			   error->code,
 -			   error->message);
 +		if (g_strcmp0 (BUILD_TYPE, "debug") == 0) {
 +			g_warning ("not GsPlugin error %s:%i: %s",
 +				   g_quark_to_string (error->domain),
 +				   error->code,
 +				   error->message);
 +		} else {
 +			g_debug ("not GsPlugin error %s:%i: %s",
 +				 g_quark_to_string (error->domain),
 +				 error->code,
 +				 error->message);
 +		}
 		g_set_error_literal (&error_copy,
 				     GS_PLUGIN_ERROR,
 				     GS_PLUGIN_ERROR_FAILED,
 diff -up gnome-software-3.36.1/meson.build.12 gnome-software-3.36.1/meson.build
 --- gnome-software-3.36.1/meson.build.12	2022-09-22 12:18:09.900892043 +0200
 +++ gnome-software-3.36.1/meson.build	2022-09-22 12:18:19.311901744 +0200
@@ -9,6 +9,7 @@ conf = configuration_data()
 conf.set_quoted('VERSION', meson.project_version())
 conf.set_quoted('PACKAGE_NAME', meson.project_name())
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 +conf.set_quoted('BUILD_TYPE', get_option('buildtype'))
 # this refers to the gnome-software plugin API version
 # this is not in any way related to a package or soname version
 diff -up gnome-software-3.36.1/src/gs-shell.c.12 gnome-software-3.36.1/src/gs-shell.c
 --- gnome-software-3.36.1/src/gs-shell.c.12	2022-09-22 12:17:59.301881111 +0200
 +++ gnome-software-3.36.1/src/gs-shell.c	2022-09-22 12:17:59.392881205 +0200
@@ -2044,10 +2044,17 @@ gs_shell_rescan_events (GsShell *shell)
 			    !g_error_matches (error,
 					      G_IO_ERROR,
 					      G_IO_ERROR_CANCELLED)) {
 -				g_warning ("not handling error %s for action %s: %s",
 -					   gs_plugin_error_to_string (error->code),
 -					   gs_plugin_action_to_string (action),
 -					   error->message);
 +				if (g_strcmp0 (BUILD_TYPE, "debug") == 0) {
 +					g_warning ("not handling error %s for action %s: %s",
 +						   gs_plugin_error_to_string (error->code),
 +						   gs_plugin_action_to_string (action),
 +						   error->message);
 +				} else {
 +					g_debug ("not handling error %s for action %s: %s",
 +						 gs_plugin_error_to_string (error->code),
 +						 gs_plugin_action_to_string (action),
 +						 error->message);
 +				}
 			}
 			gs_plugin_event_add_flag (event, GS_PLUGIN_EVENT_FLAG_INVALID);
 			return;
--- a/SOURCES/0004-set-interactive-flag-on-PkClient.patch
+++ b/SOURCES/0004-set-interactive-flag-on-PkClient.patch
@ -1,197 +0,0 @@
 diff -up gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit.c.13 gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit.c
 --- gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit.c.13	2023-04-25 17:12:24.676551145 +0200
 +++ gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit.c	2023-04-25 17:13:54.026626204 +0200
@@ -38,6 +38,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 	priv->task = pk_task_new ();
 	pk_client_set_background (PK_CLIENT (priv->task), FALSE);
 	pk_client_set_cache_age (PK_CLIENT (priv->task), G_MAXUINT);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 }
 void
@@ -71,6 +72,7 @@ gs_plugin_add_sources_related (GsPlugin
 					 PK_FILTER_ENUM_NOT_COLLECTIONS,
 					 -1);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_get_packages (PK_CLIENT(priv->task),
 					   filter,
 					   cancellable,
@@ -134,6 +136,7 @@ gs_plugin_add_sources (GsPlugin *plugin,
 					 PK_FILTER_ENUM_NOT_SUPPORTED,
 					 -1);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_get_repo_list (PK_CLIENT(priv->task),
 					   filter,
 					   cancellable,
@@ -195,6 +198,7 @@ gs_plugin_app_origin_repo_enable (GsPlug
 	/* do sync call */
 	gs_plugin_status_update (plugin, app, GS_PLUGIN_STATUS_WAITING);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_repo_enable (PK_CLIENT (priv->task),
 	                                 repo_id,
 	                                 TRUE,
@@ -229,6 +233,7 @@ gs_plugin_repo_enable (GsPlugin *plugin,
 	gs_app_set_state (app, AS_APP_STATE_INSTALLING);
 	gs_packagekit_helper_add_app (helper, app);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_repo_enable (PK_CLIENT (priv->task),
 					 gs_app_get_id (app),
 					 TRUE,
@@ -462,6 +467,7 @@ gs_plugin_repo_disable (GsPlugin *plugin
 	gs_app_set_state (app, AS_APP_STATE_REMOVING);
 	gs_packagekit_helper_add_app (helper, app);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_repo_enable (PK_CLIENT (priv->task),
 					 gs_app_get_id (app),
 					 FALSE,
@@ -594,6 +600,7 @@ gs_plugin_add_updates (GsPlugin *plugin,
 	/* do sync call */
 	gs_plugin_status_update (plugin, NULL, GS_PLUGIN_STATUS_WAITING);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_get_updates (PK_CLIENT (priv->task),
 					 pk_bitfield_value (PK_FILTER_ENUM_NONE),
 					 cancellable,
@@ -632,6 +639,7 @@ gs_plugin_add_search_files (GsPlugin *pl
 					 PK_FILTER_ENUM_ARCH,
 					 -1);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_search_files (PK_CLIENT (priv->task),
 	                                  filter,
 	                                  search,
@@ -664,6 +672,7 @@ gs_plugin_add_search_what_provides (GsPl
 					 PK_FILTER_ENUM_ARCH,
 					 -1);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_what_provides (PK_CLIENT (priv->task),
 	                                   filter,
 	                                   search,
 diff -up gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-local.c.13 gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-local.c
 --- gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-local.c.13	2020-05-22 16:51:19.876380400 +0200
 +++ gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-local.c	2023-04-25 17:12:24.756551212 +0200
@@ -29,6 +29,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 	g_mutex_init (&priv->task_mutex);
 	priv->task = pk_task_new ();
 	pk_client_set_background (PK_CLIENT (priv->task), FALSE);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 }
 void
@@ -189,6 +190,7 @@ gs_plugin_file_to_app (GsPlugin *plugin,
 	files = g_strsplit (filename, "\t", -1);
 	g_mutex_lock (&priv->task_mutex);
 	pk_client_set_cache_age (PK_CLIENT (priv->task), G_MAXUINT);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_get_details_local (PK_CLIENT (priv->task),
 					       files,
 					       cancellable,
 diff -up gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine.c.13 gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine.c
 --- gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine.c.13	2020-05-22 16:51:19.877380400 +0200
 +++ gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine.c	2023-04-25 17:12:24.756551212 +0200
@@ -56,6 +56,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 			  G_CALLBACK (gs_plugin_packagekit_repo_list_changed_cb), plugin);
 	pk_client_set_background (priv->client, FALSE);
 	pk_client_set_cache_age (priv->client, G_MAXUINT);
 +	pk_client_set_interactive (priv->client, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	/* need pkgname and ID */
 	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
@@ -587,6 +588,7 @@ gs_plugin_packagekit_refine_distro_upgra
 	g_mutex_lock (&priv->client_mutex);
 	cache_age_save = pk_client_get_cache_age (priv->client);
 	pk_client_set_cache_age (priv->client, 60 * 60 * 24 * 7); /* once per week */
 +	pk_client_set_interactive (priv->client, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_upgrade_system (priv->client,
 					    pk_bitfield_from_enums (PK_TRANSACTION_FLAG_ENUM_SIMULATE, -1),
 					    gs_app_get_version (app),
 diff -up gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine-repos.c.13 gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine-repos.c
 --- gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine-repos.c.13	2020-05-22 16:51:19.877380400 +0200
 +++ gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refine-repos.c	2023-04-25 17:12:24.756551212 +0200
@@ -36,6 +36,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 	priv->client = pk_client_new ();
 	pk_client_set_background (priv->client, FALSE);
 	pk_client_set_cache_age (priv->client, G_MAXUINT);
 +	pk_client_set_interactive (priv->client, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	/* need repos::repo-filename */
 	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "repos");
@@ -65,6 +66,7 @@ gs_plugin_packagekit_refine_repo_from_fi
 	to_array[0] = filename;
 	gs_packagekit_helper_add_app (helper, app);
 	g_mutex_lock (&priv->client_mutex);
 +	pk_client_set_interactive (priv->client, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_search_files (priv->client,
 	                                  pk_bitfield_from_enums (PK_FILTER_ENUM_INSTALLED, -1),
 	                                  (gchar **) to_array,
 diff -up gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refresh.c.13 gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refresh.c
 --- gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refresh.c.13	2020-05-22 16:51:19.877380400 +0200
 +++ gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-refresh.c	2023-04-25 17:12:24.756551212 +0200
@@ -35,6 +35,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 	priv->task = pk_task_new ();
 	pk_task_set_only_download (priv->task, TRUE);
 	pk_client_set_background (PK_CLIENT (priv->task), TRUE);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	/* we can return better results than dpkg directly */
 	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "dpkg");
@@ -67,6 +68,7 @@ _download_only (GsPlugin *plugin, GsAppL
 	 * we end up downloading a different set of packages than what was
 	 * shown to the user */
 	pk_client_set_cache_age (PK_CLIENT (priv->task), G_MAXUINT);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_get_updates (PK_CLIENT (priv->task),
 					 pk_bitfield_value (PK_FILTER_ENUM_NONE),
 					 cancellable,
@@ -165,6 +167,7 @@ gs_plugin_refresh (GsPlugin *plugin,
 	g_mutex_lock (&priv->task_mutex);
 	/* cache age of 1 is user-initiated */
 	pk_client_set_background (PK_CLIENT (priv->task), cache_age > 1);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	pk_client_set_cache_age (PK_CLIENT (priv->task), cache_age);
 	/* refresh the metadata */
 	results = pk_client_refresh_cache (PK_CLIENT (priv->task),
 diff -up gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-upgrade.c.13 gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-upgrade.c
 --- gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-upgrade.c.13	2020-05-22 16:51:19.877380400 +0200
 +++ gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-upgrade.c	2023-04-25 17:14:16.586645156 +0200
@@ -30,6 +30,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 	pk_task_set_only_download (priv->task, TRUE);
 	pk_client_set_background (PK_CLIENT (priv->task), TRUE);
 	pk_client_set_cache_age (PK_CLIENT (priv->task), 60 * 60 * 24);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 }
 void
@@ -69,6 +70,7 @@ gs_plugin_app_upgrade_download (GsPlugin
 	gs_app_set_state (app, AS_APP_STATE_INSTALLING);
 	gs_packagekit_helper_set_progress_app (helper, app);
 	g_mutex_lock (&priv->task_mutex);
 +	pk_client_set_interactive (PK_CLIENT (priv->task), gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_task_upgrade_system_sync (priv->task,
 					       gs_app_get_version (app),
 					       PK_UPGRADE_KIND_ENUM_COMPLETE,
 diff -up gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-url-to-app.c.13 gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-url-to-app.c
 --- gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-url-to-app.c.13	2020-05-22 16:51:19.878380300 +0200
 +++ gnome-software-3.36.1/plugins/packagekit/gs-plugin-packagekit-url-to-app.c	2023-04-25 17:12:24.756551212 +0200
@@ -28,6 +28,7 @@ gs_plugin_initialize (GsPlugin *plugin)
 	pk_client_set_background (priv->client, FALSE);
 	pk_client_set_cache_age (priv->client, G_MAXUINT);
 +	pk_client_set_interactive (priv->client, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 }
 void
@@ -87,6 +88,7 @@ gs_plugin_url_to_app (GsPlugin *plugin,
 	package_ids[0] = g_strdup (path);
 	g_mutex_lock (&priv->client_mutex);
 +	pk_client_set_interactive (priv->client, gs_plugin_has_flags (plugin, GS_PLUGIN_FLAGS_INTERACTIVE));
 	results = pk_client_resolve (priv->client,
 				     pk_bitfield_from_enums (PK_FILTER_ENUM_NEWEST, PK_FILTER_ENUM_ARCH, -1),
 				     package_ids,
--- a/SOURCES/add-back-shell-extensions-support.patch
+++ b/SOURCES/add-back-shell-extensions-support.patch
--- a/SOURCES/be-able-to-disable-odrs.patch
+++ b/SOURCES/be-able-to-disable-odrs.patch
@ -1,27 +0,0 @@
 From b50003ed83cab2c6cf6654e5972d6ee3e2303eb6 Mon Sep 17 00:00:00 2001
 From: Milan Crha <mcrha@redhat.com>
 Date: Tue, 16 Feb 2021 16:09:08 +0100
 Subject: [PATCH] odrs: Cannot be disabled by filling empty 'review-server'
 setting
 Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1143
 ---
 plugins/odrs/gs-plugin-odrs.c | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/plugins/odrs/gs-plugin-odrs.c b/plugins/odrs/gs-plugin-odrs.c
 index f0c0c3b91..2c9bd878d 100644
 --- a/plugins/odrs/gs-plugin-odrs.c
 +++ b/plugins/odrs/gs-plugin-odrs.c
@@ -175,6 +175,8 @@ gs_plugin_initialize (GsPlugin *plugin)
 	/* set name of MetaInfo file */
 	gs_plugin_set_appstream_id (plugin, "org.gnome.Software.Plugin.Odrs");
 +
 +	gs_plugin_set_enabled (plugin, priv->review_server && *priv->review_server);
 }
 static GArray *
 -- 
 GitLab
--- a/SOURCES/crash-when-run-as-root.patch
+++ b/SOURCES/crash-when-run-as-root.patch
@ -1,57 +0,0 @@
 From 98dbef8b5a547d3d920d377022e20d2e63519b2f Mon Sep 17 00:00:00 2001
 From: Milan Crha <mcrha@redhat.com>
 Date: Tue, 16 Feb 2021 12:58:19 +0100
 Subject: [PATCH 1/2] GsApplication: Crash when run as root
 The `search_provider` is not initialized in this case, leading
 to NULL dereference. Skip the call in such cases, because the search
 provider is not that important.
 Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1142
 ---
 src/gs-application.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/src/gs-application.c b/src/gs-application.c
 index 48f0c6aac..fdb5f55c4 100644
 --- a/src/gs-application.c
 +++ b/src/gs-application.c
@@ -912,7 +912,8 @@ static void
 gs_application_setup_search_provider (GsApplication *app)
 {
 	gs_application_initialize_plugins (app);
 -	gs_shell_search_provider_setup (app->search_provider, app->plugin_loader);
 +	if (app->search_provider)
 +		gs_shell_search_provider_setup (app->search_provider, app->plugin_loader);
 }
 static void
 -- 
 GitLab
 From 0055bfa8535bb7c5ccd9ace244d71b2885a47daa Mon Sep 17 00:00:00 2001
 From: Philip Withnall <philip@tecnocode.co.uk>
 Date: Mon, 22 Feb 2021 11:41:05 +0000
 Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s)
 ---
 src/gs-application.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/gs-application.c b/src/gs-application.c
 index fdb5f55c4..f05f6f718 100644
 --- a/src/gs-application.c
 +++ b/src/gs-application.c
@@ -49,7 +49,7 @@ struct _GsApplication {
 #ifdef HAVE_PACKAGEKIT
 	GsDbusHelper	*dbus_helper;
 #endif
 -	GsShellSearchProvider *search_provider;
 +	GsShellSearchProvider *search_provider;  /* (nullable) (owned) */
 	GSettings       *settings;
 	GSimpleActionGroup	*action_map;
 	guint		 shell_loaded_handler_id;
 -- 
 GitLab
--- a/SOURCES/devel-install-headers.patch
+++ b/SOURCES/devel-install-headers.patch
@ -1,36 +0,0 @@
 From 5b0e476a17129be0d8b451467aded9c8ae861218 Mon Sep 17 00:00:00 2001
 From: Rasmus Thomsen <oss@cogitri.dev>
 Date: Fri, 17 Apr 2020 18:55:21 +0200
 Subject: [PATCH] build: install more headers
 These are required for building out of tree plugins
 ---
 lib/meson.build | 6 ++++++
 1 file changed, 6 insertions(+)
 diff --git a/lib/meson.build b/lib/meson.build
 index 1c00d4f3e..6a2e803e5 100644
 --- a/lib/meson.build
 +++ b/lib/meson.build
@@ -4,12 +4,18 @@ cargs += ['-DLOCALPLUGINDIR=""']
 install_headers([
     'gnome-software.h',
     'gs-app.h',
 +    'gs-app-collation.h',
     'gs-app-list.h',
 +    'gs-autocleanups.h',
     'gs-category.h',
 +    'gs-ioprio.h',
     'gs-metered.h',
     'gs-os-release.h',
     'gs-plugin.h',
     'gs-plugin-event.h',
 +    'gs-plugin-job.h',
 +    'gs-plugin-loader.h',
 +    'gs-plugin-loader-sync.h',
     'gs-plugin-types.h',
     'gs-plugin-vfuncs.h',
     'gs-utils.h'
 -- 
 GitLab
--- a/SOURCES/flatpak-same-runtime-origin.patch
+++ b/SOURCES/flatpak-same-runtime-origin.patch
@ -1,117 +0,0 @@
 diff -up gnome-software-3.36.1/plugins/flatpak/gs-flatpak.c.10 gnome-software-3.36.1/plugins/flatpak/gs-flatpak.c
 --- gnome-software-3.36.1/plugins/flatpak/gs-flatpak.c.10	2020-05-22 16:51:19.868380300 +0200
 +++ gnome-software-3.36.1/plugins/flatpak/gs-flatpak.c	2021-06-21 21:24:00.233689928 +0200
@@ -1844,12 +1844,13 @@ gs_flatpak_refine_app_state (GsFlatpak *
 }
 static GsApp *
 -gs_flatpak_create_runtime (GsFlatpak *self, GsApp *parent, const gchar *runtime)
 +gs_flatpak_create_runtime (GsFlatpak *self, GsApp *parent, const gchar *runtime, GCancellable *cancellable)
 {
 	g_autofree gchar *source = NULL;
 	g_auto(GStrv) split = NULL;
 	g_autoptr(GsApp) app_cache = NULL;
 	g_autoptr(GsApp) app = NULL;
 +	const gchar *origin;
 	/* get the name/arch/branch */
 	split = g_strsplit (runtime, "/", -1);
@@ -1864,6 +1865,24 @@ gs_flatpak_create_runtime (GsFlatpak *se
 	gs_app_set_kind (app, AS_APP_KIND_RUNTIME);
 	gs_app_set_branch (app, split[2]);
 +	origin = gs_app_get_origin (parent);
 +	if (origin != NULL) {
 +		g_autoptr(FlatpakRemoteRef) xref = NULL;
 +
 +		xref = flatpak_installation_fetch_remote_ref_sync (self->installation,
 +								   origin,
 +								   FLATPAK_REF_KIND_RUNTIME,
 +								   gs_app_get_id (app),
 +								   gs_flatpak_app_get_ref_arch (parent),
 +								   gs_app_get_branch (app),
 +								   cancellable,
 +								   NULL);
 +
 +		/* Prefer runtime from the same origin as the parent application */
 +		if (xref)
 +			gs_app_set_origin (app, origin);
 +	}
 +
 	/* search in the cache */
 	app_cache = gs_plugin_cache_lookup (self->plugin, gs_app_get_unique_id (app));
 	if (app_cache != NULL) {
@@ -1898,6 +1917,7 @@ gs_flatpak_set_app_metadata (GsFlatpak *
 			     GsApp *app,
 			     const gchar *data,
 			     gsize length,
 +			     GCancellable *cancellable,
 			     GError **error)
 {
 	gboolean secure = TRUE;
@@ -1951,7 +1971,7 @@ gs_flatpak_set_app_metadata (GsFlatpak *
 		gs_app_add_kudo (app, GS_APP_KUDO_SANDBOXED_SECURE);
 	/* create runtime */
 -	app_runtime = gs_flatpak_create_runtime (self, app, runtime);
 +	app_runtime = gs_flatpak_create_runtime (self, app, runtime, cancellable);
 	if (app_runtime != NULL) {
 		gs_plugin_refine_item_scope (self, app_runtime);
 		gs_app_set_runtime (app, app_runtime);
@@ -2046,7 +2066,7 @@ gs_plugin_refine_item_metadata (GsFlatpa
 	}
 	/* parse key file */
 -	if (!gs_flatpak_set_app_metadata (self, app, str, len, error))
 +	if (!gs_flatpak_set_app_metadata (self, app, str, len, cancellable, error))
 		return FALSE;
 	return TRUE;
 }
@@ -2506,6 +2526,7 @@ gs_flatpak_file_to_app_bundle (GsFlatpak
 	if (!gs_flatpak_set_app_metadata (self, app,
 					  g_bytes_get_data (metadata, NULL),
 					  g_bytes_get_size (metadata),
 +					  cancellable,
 					  error))
 		return NULL;
 diff -up gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.10 gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c
 --- gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.10	2021-06-21 20:38:42.585590510 +0200
 +++ gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c	2021-06-21 21:23:00.977665979 +0200
@@ -852,6 +852,36 @@ gs_plugin_app_install (GsPlugin *plugin,
 						      ref, NULL, error)) {
 			gs_flatpak_error_convert (error);
 			return FALSE;
 +		} else {
 +			GsApp *runtime;
 +
 +			runtime = gs_app_get_runtime (app);
 +			if (runtime != NULL && gs_app_get_origin (runtime) != NULL) {
 +				g_autoptr(FlatpakInstalledRef) runtime_ref = NULL;
 +
 +				runtime_ref = flatpak_installation_get_installed_ref (gs_flatpak_get_installation (flatpak),
 +						gs_flatpak_app_get_ref_kind (runtime),
 +						gs_flatpak_app_get_ref_name (runtime),
 +						gs_flatpak_app_get_ref_arch (runtime),
 +						gs_app_get_branch (runtime),
 +						cancellable,
 +						NULL);
 +				if (runtime_ref == NULL) {
 +					g_autoptr(GError) error_local = NULL;
 +
 +					g_clear_pointer (&ref, g_free);
 +					ref = gs_flatpak_app_get_ref_display (runtime);
 +					if (!flatpak_transaction_add_install (transaction, gs_app_get_origin (runtime), ref, NULL, &error_local)) {
 +						if (g_error_matches (error_local, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED)) {
 +							g_clear_error (&error_local);
 +						} else {
 +							g_propagate_error (error, g_steal_pointer (&error_local));
 +							gs_flatpak_error_convert (error);
 +							return FALSE;
 +						}
 +					}
 +				}
 +			}
 		}
 	}
--- a/SOURCES/gnome-software-3.36.1-unrelated-refs.patch
+++ b/SOURCES/gnome-software-3.36.1-unrelated-refs.patch
@ -1,26 +0,0 @@
 diff -up gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.unrelated-refs gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c
 --- gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.unrelated-refs	2020-10-09 14:07:16.407235531 -0400
 +++ gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c	2020-10-09 14:08:48.775544689 -0400
@@ -696,6 +696,11 @@ gs_plugin_app_remove (GsPlugin *plugin,
 		gs_flatpak_error_convert (error);
 		return FALSE;
 	}
 +
 +	/* add to the transaction cache for quick look up -- other unrelated
 +	 * refs will be matched using gs_plugin_flatpak_find_app_by_ref() */
 +	gs_flatpak_transaction_add_app (transaction, app);
 +
 	ref = gs_flatpak_app_get_ref_display (app);
 	if (!flatpak_transaction_add_uninstall (transaction, ref, error)) {
 		gs_flatpak_error_convert (error);
@@ -899,6 +904,10 @@ gs_plugin_flatpak_update (GsPlugin *plug
 			gs_flatpak_error_convert (error);
 			return FALSE;
 		}
 +
 +		/* add to the transaction cache for quick look up -- other unrelated
 +		 * refs will be matched using gs_plugin_flatpak_find_app_by_ref() */
 +		gs_flatpak_transaction_add_app (transaction, app);
 	}
 	/* run transaction */
--- a/SOURCES/gs-updates-page-keep-showing-installing-apps.patch
+++ b/SOURCES/gs-updates-page-keep-showing-installing-apps.patch
@ -1,97 +0,0 @@
 diff -up gnome-software-3.36.1/lib/gs-plugin.c.1888404 gnome-software-3.36.1/lib/gs-plugin.c
 --- gnome-software-3.36.1/lib/gs-plugin.c.1888404	2021-05-24 13:50:34.302612057 +0200
 +++ gnome-software-3.36.1/lib/gs-plugin.c	2021-05-24 13:50:39.160609728 +0200
@@ -1398,6 +1398,44 @@ gs_plugin_cache_lookup (GsPlugin *plugin
 }
 /**
 + * gs_plugin_cache_lookup_by_state:
 + * @plugin: a #GsPlugin
 + * @list: a #GsAppList to add applications to
 + * @state: a #AsAppState
 + *
 + * Adds each cached #GsApp with state @state into the @list.
 + * When the state is %AS_APP_STATE_UNKNOWN, then adds all
 + * cached applications.
 + *
 + * Since: 3.36.1-8
 + **/
 +void
 +gs_plugin_cache_lookup_by_state (GsPlugin *plugin,
 +				 GsAppList *list,
 +				 AsAppState state)
 +{
 +	GsPluginPrivate *priv;
 +	GHashTableIter iter;
 +	gpointer value;
 +	g_autoptr(GMutexLocker) locker = NULL;
 +
 +	g_return_if_fail (GS_IS_PLUGIN (plugin));
 +	g_return_if_fail (GS_IS_APP_LIST (list));
 +
 +	priv = gs_plugin_get_instance_private (plugin);
 +	locker = g_mutex_locker_new (&priv->cache_mutex);
 +
 +	g_hash_table_iter_init (&iter, priv->cache);
 +	while (g_hash_table_iter_next (&iter, NULL, &value)) {
 +		GsApp *app = value;
 +
 +		if (state == AS_APP_STATE_UNKNOWN ||
 +		    state == gs_app_get_state (app))
 +			gs_app_list_add (list, app);
 +	}
 +}
 +
 +/**
  * gs_plugin_cache_remove:
  * @plugin: a #GsPlugin
  * @key: a key which matches
 diff -up gnome-software-3.36.1/lib/gs-plugin.h.1888404 gnome-software-3.36.1/lib/gs-plugin.h
 --- gnome-software-3.36.1/lib/gs-plugin.h.1888404	2021-05-24 13:50:34.302612057 +0200
 +++ gnome-software-3.36.1/lib/gs-plugin.h	2021-05-24 13:50:39.160609728 +0200
@@ -102,6 +102,9 @@ gboolean	 gs_plugin_check_distro_id		(Gs
 							 const gchar	*distro_id);
 GsApp		*gs_plugin_cache_lookup			(GsPlugin	*plugin,
 							 const gchar	*key);
 +void		 gs_plugin_cache_lookup_by_state	(GsPlugin	*plugin,
 +							 GsAppList	*list,
 +							 AsAppState	 state);
 void		 gs_plugin_cache_add			(GsPlugin	*plugin,
 							 const gchar	*key,
 							 GsApp		*app);
 diff -up gnome-software-3.36.1/lib/gs-plugin-loader.c.1888404 gnome-software-3.36.1/lib/gs-plugin-loader.c
 --- gnome-software-3.36.1/lib/gs-plugin-loader.c.1888404	2021-05-24 13:50:34.302612057 +0200
 +++ gnome-software-3.36.1/lib/gs-plugin-loader.c	2021-05-24 13:50:39.159609728 +0200
@@ -1273,7 +1273,7 @@ static gboolean
 gs_plugin_loader_app_is_valid_updatable (GsApp *app, gpointer user_data)
 {
 	return gs_plugin_loader_app_is_valid (app, user_data) &&
 -		gs_app_is_updatable (app);
 +		(gs_app_is_updatable (app) || gs_app_get_state (app) == AS_APP_STATE_INSTALLING);
 }
 static gboolean
 diff -up gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.1888404 gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c
 --- gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.1888404	2021-05-24 13:50:34.310612054 +0200
 +++ gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c	2021-05-24 13:50:39.161609727 +0200
@@ -218,6 +218,7 @@ gs_plugin_add_updates (GsPlugin *plugin,
 		if (!gs_flatpak_add_updates (flatpak, list, cancellable, error))
 			return FALSE;
 	}
 +	gs_plugin_cache_lookup_by_state (plugin, list, AS_APP_STATE_INSTALLING);
 	return TRUE;
 }
 diff -up gnome-software-3.36.1/src/gs-updates-page.c.1888404 gnome-software-3.36.1/src/gs-updates-page.c
 --- gnome-software-3.36.1/src/gs-updates-page.c.1888404	2021-05-24 13:50:39.161609727 +0200
 +++ gnome-software-3.36.1/src/gs-updates-page.c	2021-05-24 13:51:00.211599638 +0200
@@ -139,7 +139,8 @@ gs_updates_page_invalidate (GsUpdatesPag
 static GsUpdatesSectionKind
 _get_app_section (GsApp *app)
 {
 -	if (gs_app_get_state (app) == AS_APP_STATE_UPDATABLE_LIVE) {
 +	if (gs_app_get_state (app) == AS_APP_STATE_UPDATABLE_LIVE ||
 +	    gs_app_get_state (app) == AS_APP_STATE_INSTALLING) {
 		if (gs_app_get_kind (app) == AS_APP_KIND_FIRMWARE)
 			return GS_UPDATES_SECTION_KIND_ONLINE_FIRMWARE;
 		return GS_UPDATES_SECTION_KIND_ONLINE;
--- a/SPECS/gnome-software.spec
+++ b/SPECS/gnome-software.spec
@ -1,794 +0,0 @@
 %global glib2_version 2.56.0
 %global gtk3_version 3.22.4
 %global json_glib_version 1.2.0
 %global packagekit_version 1.1.12-7
 %global appstream_glib_version 0.7.14-3
 %global libsoup_version 2.52.0
 %global gsettings_desktop_schemas_version 3.12.0
 %global gnome_desktop_version 3.18.0
 %global fwupd_version 1.0.7
 %global flatpak_version 0.9.4
 %global libxmlb_version 0.1.7
 %global fwupd_arches aarch64 ppc64le s390x x86_64
 Name:      gnome-software
 Version:   3.36.1
 Release:   12%{?dist}
 Summary:   A software center for GNOME
 License:   GPLv2+
 URL:       https://wiki.gnome.org/Apps/Software
 Source0:   https://download.gnome.org/sources/gnome-software/3.36/%{name}-%{version}.tar.xz
 # Add support for basic auth and webflow auth in flatpak plugin
 # https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/467
 Patch0:    0001-Add-basic-auth-support-to-flatpak-plugin.patch
 Patch1:    0002-Add-webflow-auth-support-to-flatpak-plugin.patch
 # Add back shell extensions support as we don't have the extensions app in RHEL 8.3
 # https://bugzilla.redhat.com/show_bug.cgi?id=1839774
 Patch2:    add-back-shell-extensions-support.patch
 # Fix hardcoded desktop and appdata names to match what's in RHEL 8.3
 Patch3:    0001-Fix-hardcoded-desktop-and-appdata-names-to-match-wha.patch
 # Fix 'Show Details' to correctly work for rpm-installed firefox
 Patch4:    0001-Improve-the-heuristic-for-detecting-old-style-AppStr.patch
 # Fix flatpak updates and removals when same ref occurs in multiple remotes
 Patch5:    gnome-software-3.36.1-unrelated-refs.patch
 Patch6:    be-able-to-disable-odrs.patch
 Patch7:    crash-when-run-as-root.patch
 Patch8:    gs-updates-page-keep-showing-installing-apps.patch
 Patch9:    flatpak-same-runtime-origin.patch
 Patch10:   devel-install-headers.patch
 Patch11:   0003-hide-some-errors.patch
 Patch12:   0004-set-interactive-flag-on-PkClient.patch
 BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 BuildRequires: desktop-file-utils
 %ifarch %{fwupd_arches}
 BuildRequires: fwupd-devel >= %{fwupd_version}
 %endif
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-desktop3-devel
 BuildRequires: gnome-online-accounts-devel
 BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
 BuildRequires: gspell-devel
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gtk-doc
 BuildRequires: json-glib-devel >= %{json_glib_version}
 BuildRequires: libappstream-glib-devel >= %{appstream_glib_version}
 BuildRequires: libsoup-devel
 BuildRequires: libxmlb-devel >= %{libxmlb_version}
 BuildRequires: meson
 BuildRequires: PackageKit-glib-devel >= %{packagekit_version}
 BuildRequires: polkit-devel
 BuildRequires: flatpak-devel >= %{flatpak_version}
 %if 0%{?fedora}
 BuildRequires: libdnf-devel
 BuildRequires: ostree-devel
 BuildRequires: rpm-devel
 BuildRequires: rpm-ostree-devel
 %endif
 BuildRequires: libgudev1-devel
 %ifarch %{valgrind_arches}
 BuildRequires: valgrind-devel
 %endif
 Requires: appstream-data
 Requires: flatpak%{?_isa} >= %{flatpak_version}
 Requires: flatpak-libs%{?_isa} >= %{flatpak_version}
 %ifarch %{fwupd_arches}
 Requires: fwupd%{?_isa} >= %{fwupd_version}
 %endif
 Requires: glib2%{?_isa} >= %{glib2_version}
 Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
 # gnome-menus is needed for app folder .directory entries
 Requires: gnome-menus%{?_isa}
 Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
 Requires: gtk3%{?_isa} >= %{gtk3_version}
 Requires: json-glib%{?_isa} >= %{json_glib_version}
 Requires: iso-codes
 Requires: libappstream-glib%{?_isa} >= %{appstream_glib_version}
 # librsvg2 is needed for gdk-pixbuf svg loader
 Requires: librsvg2%{?_isa}
 Requires: libsoup%{?_isa} >= %{libsoup_version}
 Requires: PackageKit%{?_isa} >= %{packagekit_version}
 Requires: libxmlb%{?_isa} >= %{libxmlb_version}
 Obsoletes: gnome-software-editor < 3.35.1
 # this is not a library version
 %define gs_plugin_version               13
 %description
 gnome-software is an application that makes it easy to add, remove
 and update software in the GNOME desktop.
 %package devel
 Summary: Headers for building external gnome-software plugins
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 These development files are for building gnome-software plugins outside
 the source tree. Most users do not need this subpackage installed.
 %prep
 %autosetup -p1 -S gendiff
 %build
 %meson \
    -Dsnap=false \
 %ifnarch %{valgrind_arches}
    -Dvalgrind=false \
 %endif
 %ifnarch %{fwupd_arches}
    -Dfwupd=false \
 %endif
    -Dgudev=true \
    -Dpackagekit=true \
    -Dexternal_appstream=false \
    -Dmalcontent=false \
    -Drpm_ostree=false \
    -Dtests=false
 %meson_build
 %install
 %meson_install
 # remove unneeded dpkg plugin
 rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so
 # make the software center load faster
 desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
    --set-key=X-AppInstall-Package --set-value=%{name}
 # set up for Fedora
 cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override << FOE
 [org.gnome.software]
 official-repos = [ 'rhel-7' ]
 FOE
 %find_lang %name --with-gnome
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %files -f %{name}.lang
 %doc AUTHORS README.md
 %license COPYING
 %{_bindir}/gnome-software
 %{_datadir}/applications/gnome-software-local-file.desktop
 %{_datadir}/applications/org.gnome.Software.desktop
 %dir %{_datadir}/gnome-software
 %{_datadir}/gnome-software/*.png
 %{_mandir}/man1/gnome-software.1.gz
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Software.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Software-symbolic.svg
 %{_datadir}/icons/hicolor/scalable/status/software-installed-symbolic.svg
 %{_datadir}/gnome-software/featured-*.svg
 %{_datadir}/gnome-software/featured-*.jpg
 %{_datadir}/metainfo/org.gnome.Software.appdata.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
 %ifarch %{fwupd_arches}
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
 %endif
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml
 %dir %{_libdir}/gs-plugins-%{gs_plugin_version}
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_appstream.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-menu-path.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-pkgdb-collections.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak.so
 %ifarch %{fwupd_arches}
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fwupd.so
 %endif
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_generic-updates.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-blacklist.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_icons.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors-metadata.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_modalias.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_odrs.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_os-release.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-history.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-local.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-offline.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-proxy.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refine-repos.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refine.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refresh.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-upgrade.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-url-to-app.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance-license.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_repos.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rewrite-resource.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_shell-extensions.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_systemd-updates.so
 %{_sysconfdir}/xdg/autostart/gnome-software-service.desktop
 %{_datadir}/app-info/xmls/org.gnome.Software.Featured.xml
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 %{_datadir}/dbus-1/services/org.gnome.Software.service
 %{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini
 %{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override
 %{_libexecdir}/gnome-software-cmd
 %{_libexecdir}/gnome-software-restarter
 %files devel
 %{_libdir}/pkgconfig/gnome-software.pc
 %dir %{_includedir}/gnome-software
 %{_includedir}/gnome-software/*.h
 %{_datadir}/gtk-doc/html/gnome-software
 %changelog
 * Tue Apr 25 2023 Milan Crha <mcrha@redhat.com> - 3.36.1-12
 - Resolves: #1857654 (packagekit: Set interactive flag on PkClient)
 * Thu Sep 22 2022 Milan Crha <mcrha@redhat.com> - 3.36.1-11
 - Resolves: #2124772 (Hide some errors in non-debug builds)
 * Thu Jul 08 2021 Milan Crha <mcrha@redhat.com> - 3.36.1-10
 - Resolves: #1978505 (Development package is missing important header files)
 * Mon Jun 21 2021 Milan Crha <mcrha@redhat.com> - 3.36.1-9
 - Resolves: #1972545 (flatpak: Prefer runtime from the same origin as the application)
 * Mon May 24 2021 Milan Crha <mcrha@redhat.com> - 3.36.1-8
 - Resolves: #1888404 (Updates page hides ongoing updates on refresh)
 * Mon May 24 2021 Milan Crha <mcrha@redhat.com> - 3.36.1-7
 - Resolves: #1873297 (Crash when run as root)
 * Mon May 24 2021 Milan Crha <mcrha@redhat.com> - 3.36.1-6
 - Resolves: #1791478 (Cannot completely disable ODRS (GNOME Ratings))
 * Wed Feb 17 2021 Milan Crha <mcrha@redhat.com> - 3.36.1-5
 - Fix flatpak updates and removals when same ref occurs in multiple remotes
 - Resolves: #1888407
 * Thu Jun 11 2020 Kalev Lember <klember@redhat.com> - 3.36.1-4
 - Fix 'Show Details' to correctly work for rpm-installed firefox
 - Resolves: #1845714
 * Wed Jun 03 2020 Kalev Lember <klember@redhat.com> - 3.36.1-3
 - Upload correct 3.36.1 tarball
 - Fix hardcoded desktop and appdata names to match what's in RHEL 8.3
 - Add back shell extensions support
 - Resolves: #1839774
 * Tue Jun 02 2020 Kalev Lember <klember@redhat.com> - 3.36.1-2
 - Add support for basic auth and webflow auth in flatpak plugin
 - Resolves: #1815502
 * Fri May 22 2020 Richard Hughes <rhughes@redhat.com> - 3.36.1-1
 - Update to 3.36.1
 - Resolves: #1797932
 * Wed Jan 29 2020 Kalev Lember <klember@redhat.com> - 3.30.6-3
 - Fix issues with installing Cockpit
 - Resolves: #1759913
 * Fri Jul 12 2019 Kalev Lember <klember@redhat.com> - 3.30.6-2
 - Hide addons that are not available in repos
 - Resolves: #1719779
 * Tue Dec 18 2018 Kalev Lember <klember@redhat.com> - 3.30.6-1
 - Update to 3.30.6
 * Fri Aug  3 2018 Florian Weimer <fweimer@redhat.com> - 3.28.2-3
 - Honor %%{valgrind_arches}
 * Wed Jul 18 2018 Richard Hughes <rhughes@redhat.com> - 3.28.2-2
 - Do not build the snapd plugin on RHEL.
 * Thu Jul 12 2018 Richard Hughes <rhughes@redhat.com> - 3.28.2-1
 - Update to 3.28.2
 * Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 3.28.1-1
 - Update to 3.28.1
 * Thu Mar 29 2018 Kalev Lember <klember@redhat.com> - 3.28.0-5
 - Fix empty OS Updates showing up
 - Make rpm-ostree update triggering work
 * Thu Mar 15 2018 Kalev Lember <klember@redhat.com> - 3.28.0-4
 - Fix opening results from gnome-shell search provider
 * Wed Mar 14 2018 Kalev Lember <klember@redhat.com> - 3.28.0-3
 - Fix crash on initial run with no network (#1554986)
 * Tue Mar 13 2018 Kalev Lember <klember@redhat.com> - 3.28.0-2
 - Backport an upstream patch to fix shell extensions app ID
 * Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
 - Update to 3.28.0
 * Sun Mar 11 2018 Kalev Lember <klember@redhat.com> - 3.27.92-3
 - Rebuilt for gspell 1.8
 * Wed Mar 07 2018 Kalev Lember <klember@redhat.com> - 3.27.92-2
 - Move org.gnome.Software.Featured.xml from -editor to main package
 * Mon Mar 05 2018 Kalev Lember <klember@redhat.com> - 3.27.92-1
 - Update to 3.27.92
 * Sun Mar 04 2018 Neal Gompa <ngompa13@gmail.com> - 3.27.90-4
 - Drop obsolete snapd-login-service requirement for snap plugin subpackage
 * Mon Feb 19 2018 Adam Williamson <awilliam@redhat.com> - 3.27.90-3
 - Backport fix for RHBZ #1546893 from upstream git
 * Mon Feb 19 2018 Kalev Lember <klember@redhat.com> - 3.27.90-2
 - Re-enable rpm-ostree plugin
 * Thu Feb 15 2018 Kalev Lember <klember@redhat.com> - 3.27.90-1
 - Update to 3.27.90
 - Temporarily disable the rpm-ostree plugin
 * Tue Feb 13 2018 Björn Esser <besser82@fedoraproject.org> - 3.27.4-4
 - Rebuild against newer gnome-desktop3 package
 * Thu Feb 08 2018 Kalev Lember <klember@redhat.com> - 3.27.4-3
 - Add fedora-workstation-repositories to nonfree-sources schema defaults
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 * Mon Jan 08 2018 Kalev Lember <klember@redhat.com> - 3.27.4-1
 - Update to 3.27.4
 - Drop unused --without packagekit option
 * Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.27.3-2
 - Remove obsolete scriptlets
 * Sat Dec 16 2017 Kalev Lember <klember@redhat.com> - 3.27.3-1
 - Update to 3.27.3
 * Mon Nov 13 2017 Kalev Lember <klember@redhat.com> - 3.27.2-1
 - Update to 3.27.2
 * Thu Nov 09 2017 Kalev Lember <klember@redhat.com> - 3.26.2-1
 - Update to 3.26.2
 - Re-enable fwupd support
 * Tue Oct 31 2017 Kalev Lember <klember@redhat.com> - 3.26.1-5
 - Enable the rpm-ostree plugin
 * Wed Oct 25 2017 Kalev Lember <klember@redhat.com> - 3.26.1-4
 - Fix "too many results returned" error after distro upgrades (#1496489)
 * Tue Oct 10 2017 Kalev Lember <klember@redhat.com> - 3.26.1-3
 - Backport a flatpakref installation fix
 * Mon Oct 09 2017 Richard Hughes <rhughes@redhat.com> - 3.26.1-2
 - Disable fwupd support until we get a 3.27.1 tarball
 * Sun Oct 08 2017 Kalev Lember <klember@redhat.com> - 3.26.1-1
 - Update to 3.26.1
 * Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 3.26.0-1
 - Update to 3.26.0
 * Sun Aug 27 2017 Kalev Lember <klember@redhat.com> - 3.25.91-1
 - Update to 3.25.91
 * Tue Aug 15 2017 Kalev Lember <klember@redhat.com> - 3.25.90-1
 - Update to 3.25.90
 * Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.25.4-6
 - Rebuilt after RPM update (№ 3)
 * Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.25.4-5
 - Rebuilt for RPM soname bump
 * Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.25.4-4
 - Rebuilt for RPM soname bump
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 * Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 3.25.4-1
 - Update to 3.25.4
 * Tue Jul 18 2017 Kalev Lember <klember@redhat.com> - 3.25.3-6
 - Drop a meson workaround now that meson is fixed
 * Wed Jun 28 2017 Neal Gompa <ngompa13@gmail.com> - 3.25.3-5
 - Actually properly enable snap subpackage after removing conditional
 * Wed Jun 28 2017 Neal Gompa <ngompa13@gmail.com> - 3.25.3-4
 - Remove unnecessary arch-specific conditional for snap subpackage
 * Tue Jun 27 2017 Neal Gompa <ngompa13@gmail.com> - 3.25.3-3
 - Ensure snap subpackage is installed if snapd is installed
 * Fri Jun 23 2017 Richard Hughes <rhughes@redhat.com> - 3.24.3-2
 - Enable the snap subpackage
 * Fri Jun 23 2017 Kalev Lember <klember@redhat.com> - 3.25.3-1
 - Update to 3.25.3
 - Switch to the meson build system
 - Add an -editor subpackage with new banner editor
 * Mon May 15 2017 Richard Hughes <rhughes@redhat.com> - 3.24.3-1
 - Update to 3.23.3
 - Fix a common crash when installing flatpakrepo files
 - Ensure we show the banner when upgrades are available
 * Tue May 09 2017 Kalev Lember <klember@redhat.com> - 3.24.2-1
 - Update to 3.24.2
 * Tue Apr 25 2017 Adam Williamson <awilliam@redhat.com> - 3.24.1-2
 - Backport crasher fix from upstream (RHBZ #1444669 / BGO #781217)
 * Tue Apr 11 2017 Kalev Lember <klember@redhat.com> - 3.24.1-1
 - Update to 3.24.1
 * Tue Mar 21 2017 Kalev Lember <klember@redhat.com> - 3.24.0-1
 - Update to 3.24.0
 * Thu Mar 16 2017 Kalev Lember <klember@redhat.com> - 3.23.92-1
 - Update to 3.23.92
 * Mon Feb 27 2017 Richard Hughes <rhughes@redhat.com> - 3.23.91-1
 - Update to 3.23.91
 * Mon Feb 13 2017 Richard Hughes <rhughes@redhat.com> - 3.23.90-1
 - Update to 3.23.90
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 * Thu Dec 15 2016 Richard Hughes <rhughes@redhat.com> - 3.23.3-1
 - Update to 3.23.3
 * Wed Nov 23 2016 Kalev Lember <klember@redhat.com> - 3.23.2-1
 - Update to 3.23.2
 * Tue Nov 08 2016 Kalev Lember <klember@redhat.com> - 3.22.2-1
 - Update to 3.22.2
 * Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 3.22.1-1
 - Update to 3.22.1
 * Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 3.22.0-1
 - Update to 3.22.0
 * Wed Sep 14 2016 Kalev Lember <klember@redhat.com> - 3.21.92-1
 - Update to 3.21.92
 - Don't set group tags
 * Thu Sep 01 2016 Kalev Lember <klember@redhat.com> - 3.21.91-1
 - Update to 3.21.91
 * Wed Aug 17 2016 Kalev Lember <klember@redhat.com> - 3.21.90-2
 - Rebuilt for fixed libappstream-glib headers
 * Wed Aug 17 2016 Kalev Lember <klember@redhat.com> - 3.21.90-1
 - Update to 3.21.90
 - Tighten -devel subpackage dependencies
 * Thu Jul 28 2016 Richard Hughes <rhughes@redhat.com> - 3.21.4-2
 - Allow building without PackageKit for the atomic workstation.
 * Mon Jul 18 2016 Richard Hughes <rhughes@redhat.com> - 3.21.4-1
 - Update to 3.21.4
 * Thu May 26 2016 Kalev Lember <klember@redhat.com> - 3.21.2-2
 - Build with flatpak support
 * Mon May 23 2016 Richard Hughes <rhughes@redhat.com> - 3.21.2-1
 - Update to 3.21.2
 * Tue May 10 2016 Kalev Lember <klember@redhat.com> - 3.21.1-2
 - Require PackageKit 1.1.1 for system upgrade support
 * Mon Apr 25 2016 Richard Hughes <rhughes@redhat.com> - 3.21.1-1
 - Update to 3.21.1
 * Mon Apr 25 2016 Richard Hughes <rhughes@redhat.com> - 3.20.2-1
 - Update to 3.20.1
 - Allow popular and featured apps to match any plugin
 - Do not make the ODRS plugin depend on xdg-app
 - Fix many of the os-upgrade issues and implement the latest mockups
 - Make all the plugins more threadsafe
 - Return all update descriptions newer than the installed version
 - Show some non-fatal error messages if installing fails
 - Use a background PackageKit transaction when downloading upgrades
 * Wed Apr 13 2016 Kalev Lember <klember@redhat.com> - 3.20.1-1
 - Update to 3.20.1
 * Fri Apr 01 2016 Richard Hughes <rhughes@redhat.com> - 3.20.1-2
 - Set the list of official sources
 - Compile with xdg-app support
 * Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 3.20.0-1
 - Update to 3.20.0
 * Mon Mar 14 2016 Richard Hughes <rhughes@redhat.com> - 3.19.92-1
 - Update to 3.19.92
 * Thu Mar 03 2016 Kalev Lember <klember@redhat.com> - 3.19.91-2
 - Set minimum required json-glib version
 * Mon Feb 29 2016 Richard Hughes <rhughes@redhat.com> - 3.19.91-1
 - Update to 3.19.91
 * Mon Feb 15 2016 Richard Hughes <rhughes@redhat.com> - 3.19.90-1
 - Update to 3.19.90
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 * Fri Jan 15 2016 Richard Hughes <rhughes@redhat.com> - 3.19.4-1
 - Update to 3.19.4
 * Thu Dec 03 2015 Kalev Lember <klember@redhat.com> - 3.18.3-2
 - Require librsvg2 for the gdk-pixbuf svg loader
 * Thu Nov 05 2015 Richard Hughes <rhughes@redhat.com> - 3.18.3-1
 - Update to 3.18.3
 - Use the correct user agent string when downloading firmware
 - Fix a crash in the limba plugin
 - Fix installing web applications
 * Mon Oct 26 2015 Kalev Lember <klember@redhat.com> - 3.18.2-2
 - Fix apps reappearing as installed a few seconds after removal (#1275163)
 * Thu Oct 15 2015 Kalev Lember <klember@redhat.com> - 3.18.2-1
 - Update to 3.18.2
 * Tue Oct 13 2015 Kalev Lember <klember@redhat.com> - 3.18.1-1
 - Update to 3.18.1
 * Wed Oct 07 2015 Kalev Lember <klember@redhat.com> - 3.18.0-2
 - Backport two crasher fixes from upstream
 * Mon Sep 21 2015 Kalev Lember <klember@redhat.com> - 3.18.0-1
 - Update to 3.18.0
 * Tue Sep 15 2015 Kalev Lember <klember@redhat.com> - 3.17.92-2
 - Update dependency versions
 * Tue Sep 15 2015 Richard Hughes <rhughes@redhat.com> - 3.17.92-1
 - Update to 3.17.92
 * Thu Sep 10 2015 Richard Hughes <rhughes@redhat.com> - 3.17.91-2
 - Fix firmware updates
 * Thu Sep 03 2015 Kalev Lember <klember@redhat.com> - 3.17.91-1
 - Update to 3.17.91
 * Wed Aug 19 2015 Kalev Lember <klember@redhat.com> - 3.17.90-1
 - Update to 3.17.90
 * Wed Aug 12 2015 Richard Hughes <rhughes@redhat.com> - 3.17.3-1
 - Update to 3.17.3
 * Wed Jul 22 2015 David King <amigadave@amigadave.com> - 3.17.2-3
 - Bump for new gnome-desktop3
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 * Fri Jun 05 2015 Kalev Lember <kalevlember@gmail.com> - 3.17.2-1
 - Update to 3.17.2
 * Mon May 25 2015 Kalev Lember <kalevlember@gmail.com> - 3.17.1-1
 - Update to 3.17.1
 * Fri May 15 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.2-2
 - Fix a crash under Wayland (#1221968)
 * Mon May 11 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.2-1
 - Update to 3.16.2
 * Tue Apr 14 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.1-1
 - Update to 3.16.1
 * Mon Mar 23 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.0-1
 - Update to 3.16.0
 * Mon Mar 16 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.92-1
 - Update to 3.15.92
 - Use license macro for the COPYING file
 - Add a patch to adapt to gnome-terminal desktop file rename
 * Mon Mar 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.91-1
 - Update to 3.15.91
 * Sat Feb 21 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.90-3
 - Export DisplayName property on the packagekit session service
 * Thu Feb 19 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.90-2
 - Backport a crash fix
 * Tue Feb 17 2015 Richard Hughes <rhughes@redhat.com> - 3.15.90-1
 - Update to 3.15.90
 * Mon Jan 19 2015 Richard Hughes <rhughes@redhat.com> - 3.15.4-1
 - Update to 3.15.4
 * Tue Nov 25 2014 Kalev Lember <kalevlember@gmail.com> - 3.15.2-1
 - Update to 3.15.2
 * Thu Nov 13 2014 Richard Hughes <rhughes@redhat.com> - 3.14.2-3
 - Fix non-Fedora build
 * Tue Nov 11 2014 Richard Hughes <rhughes@redhat.com> - 3.14.2-2
 - Backport a patch to fix compilation
 * Mon Nov 10 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.2-1
 - Update to 3.14.2
 * Sat Nov 08 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.1-3
 - Update the list of system apps
 * Sat Nov 01 2014 David King <amigadave@amigadave.com> - 3.14.1-2
 - Rebuild for new libappstream-glib (#1156494)
 * Mon Oct 13 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.1-1
 - Update to 3.14.1
 * Thu Oct 09 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.0-2
 - Depend on gnome-menus for app folder directory entries
 * Mon Sep 22 2014 Kalev Lember <kalevlember@gmail.com> - 3.14.0-1
 - Update to 3.14.0
 * Wed Sep 17 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.92-2
 - Set minimum required dependency versions (#1136343)
 * Tue Sep 16 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.92-1
 - Update to 3.13.92
 - Replace gnome-system-log with gnome-logs in the system apps list
 * Tue Sep 02 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.91-1
 - Update to 3.13.91
 * Tue Aug 19 2014 Richard Hughes <rhughes@redhat.com> - 3.13.90-1
 - Update to 3.13.90
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.5-0.2.git5c89189
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 * Mon Aug 11 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.5-0.1.git5c89189
 - Update to 3.13.5 git snapshot
 - Ship HighContrast icons
 * Sun Aug 03 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.4-2
 - Replace Epiphany with Firefox in the system apps list
 * Wed Jul 23 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.4-1
 - Update to 3.13.4
 * Wed Jun 25 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.3-1
 - Update to 3.13.3
 * Thu Jun 12 2014 Richard Hughes <rhughes@redhat.com> - 3.13.3-0.2.git7491627
 - Depend on the newly-created appstream-data package and stop shipping
  the metadata here.
 * Sat Jun 07 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.3-0.1.git7491627
 - Update to 3.13.3 git snapshot
 * Wed May 28 2014 Richard Hughes <rhughes@redhat.com> - 3.13.2-2
 - Rebuild with new metadata.
 * Wed May 28 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.2-1
 - Update to 3.13.2
 * Thu May 15 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.1-4
 - Depend on gsettings-desktop-schemas
 * Mon May 12 2014 Richard Hughes <rhughes@redhat.com> - 3.13.1-3
 - Update the metadata and use appstream-util to install the metadata.
 * Wed May 07 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.1-2
 - Drop gnome-icon-theme dependency
 * Mon Apr 28 2014 Richard Hughes <rhughes@redhat.com> - 3.13.1-1
 - Update to 3.13.1
 * Fri Apr 11 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.1-2
 - Rebuild with new metadata.
 * Fri Apr 11 2014 Richard Hughes <rhughes@redhat.com> - 3.12.1-1
 - Update to 3.12.1
 * Mon Mar 24 2014 Richard Hughes <rhughes@redhat.com> - 3.12.0-1
 - Update to 3.12.0
 * Thu Mar 20 2014 Richard Hughes <rhughes@redhat.com> - 3.11.92-1
 - Update to 3.11.92
 * Tue Mar 18 2014 Richard Hughes <rhughes@redhat.com> - 3.11.91-2
 - Rebuild with new metadata.
 * Sat Mar 08 2014 Richard Hughes <rhughes@redhat.com> - 3.11.91-1
 - Update to 3.11.91
 * Tue Feb 18 2014 Richard Hughes <rhughes@redhat.com> - 3.11.90-1
 - Update to 3.11.90
 * Mon Feb 03 2014 Richard Hughes <rhughes@redhat.com> - 3.11.5-2
 - Require epiphany-runtime rather than the full application
 * Mon Feb 03 2014 Richard Hughes <rhughes@redhat.com> - 3.11.5-1
 - Update to 3.11.5
 * Thu Jan 30 2014 Richard Hughes <rhughes@redhat.com> - 3.11.4-3
 - Rebuild for libpackagekit-glib soname bump
 * Wed Jan 22 2014 Richard Hughes <rhughes@redhat.com> - 3.11.4-2
 - Rebuild with metadata that has the correct screenshot url.
 * Thu Jan 16 2014 Richard Hughes <rhughes@redhat.com> - 3.11.4-1
 - Update to 3.11.4
 * Tue Dec 17 2013 Richard Hughes <rhughes@redhat.com> - 3.11.3-1
 - Update to 3.11.3
 * Tue Nov 19 2013 Richard Hughes <rhughes@redhat.com> - 3.11.2-1
 - Update to 3.11.2
 * Tue Oct 29 2013 Richard Hughes <rhughes@redhat.com> - 3.11.1-1
 - Update to 3.11.1
 - Add a gnome shell search provider
 - Add a module to submit the user rating to the fedora-tagger web service
 - Add support for 'missing' codecs that we know exist but we can't install
 - Add support for epiphany web applications
 - Handle offline installation sensibly
 - Save the user rating if the user clicks the rating stars
 - Show a modal error message if install or remove actions failed
 - Show a star rating on the application details page
 - Show font screenshots
 - Show more detailed version numbers when required
 - Show screenshots to each application
 * Wed Sep 25 2013 Richard Hughes <richard@hughsie.com> 3.10.0-1
 - New upstream release.
 - New metadata for fedora, updates and updates-testing
 - Add a plugin to query the PackageKit prepared-update file directly
 - Do not clear the offline-update trigger if rebooting succeeded
 - Do not load incompatible projects when parsing AppStream data
 - Lots of updated translations
 - Show the window right away when starting
 * Fri Sep 13 2013 Richard Hughes <richard@hughsie.com> 3.9.3-1
 - New upstream release.
 - Lots of new and fixed UI and updated metadata for Fedora 20
 * Tue Sep 03 2013 Richard Hughes <richard@hughsie.com> 3.9.2-1
 - New upstream release.
 - Allow stock items in the AppStream XML
 - Extract the AppStream URL and description from the XML
 - Only present the window when the overview is complete
 - Return the subcategories sorted by name
 * Mon Sep 02 2013 Richard Hughes <richard@hughsie.com> 3.9.1-1
 - New upstream release which is a technical preview for the alpha.
 * Sun Sep 01 2013 Richard Hughes <richard@hughsie.com> 0.1-3
 - Use buildroot not RPM_BUILD_ROOT
 - Own all gnome-software directories
 - Drop gtk-update-icon-cache requires and the mime database functionality
 * Thu Aug 29 2013 Richard Hughes <richard@hughsie.com> 0.1-2
 - Add call to desktop-file-validate and fix other review comments.
 * Wed Aug 28 2013 Richard Hughes <richard@hughsie.com> 0.1-1
 - First release for Fedora package review
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
 --- !Policy
 product_versions:
  - rhel-10
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/gnome-software.spec
+++ b/gnome-software.spec
--- a/org.gnome.App-list-1.0.xml
+++ b/org.gnome.App-list-1.0.xml
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,7 @@
 ---
 runpath:
    allowed_paths:
        - /usr/lib/gnome-software
        - /usr/lib/rpm-ostree
        - /usr/lib64/gnome-software
        - /usr/lib64/rpm-ostree
--- a/1
+++ b/1
@ -0,0 +1 @@
 SHA512 (gnome-software-47.1.tar.xz) = 18c500ef0487f9303097f939e11d2841df87d609d05484e3d4419ce9a27f6156ec4aabeca61191724d557b5603ff7857095ed09fc065b6064d0b92286bc19748
`@ -1 +1 @@`
	`SOURCES/gnome-software-3.36.1.tar.xz`	`/gnome-software-*.tar.xz`
		`@ -0,0 +1 @@`
							`SHA512 (gnome-software-47.1.tar.xz) = 18c500ef0487f9303097f939e11d2841df87d609d05484e3d4419ce9a27f6156ec4aabeca61191724d557b5603ff7857095ed09fc065b6064d0b92286bc19748`