.gitignore

@@ -1 +1 @@
-SOURCES/gnome-software-41.5.tar.xz
+SOURCES/gnome-software-46.4.tar.xz

.gnome-software.metadata

@@ -1 +1 @@
-bc37c8ed81ddff70749abcf7ab94bdcf3fffad0f SOURCES/gnome-software-41.5.tar.xz
+b46116415236a47382685879f23a0fc6d20acfa5 SOURCES/gnome-software-46.4.tar.xz

SOURCES/0001-crash-with-broken-theme.patch

@@ -1,48 +0,0 @@
-From 3a644c151f27f439c36170f0958fd21cf1cc54d0 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 3 Jun 2021 08:33:53 +0200
-Subject: [PATCH] gs-feature-tile: Do not abort when the theme is broken
-
-Just print a warning when the theme doesn't provide 'theme_fg_color' and
-fallback to black color.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1228
----
- src/gs-feature-tile.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/gs-feature-tile.c b/src/gs-feature-tile.c
-index 1c85083eb..158af1e56 100644
---- a/src/gs-feature-tile.c
-+++ b/src/gs-feature-tile.c
-@@ -268,7 +268,6 @@ gs_feature_tile_refresh (GsAppTile *self)
- 		if (key_colors != tile->key_colors_cache) {
- 			g_autoptr(GArray) colors = NULL;
- 			GdkRGBA fg_rgba;
--			gboolean fg_rgba_valid;
- 			GsHSBC fg_hsbc;
- 
- 			/* Look up the foreground colour for the feature tile,
-@@ -283,8 +282,17 @@ gs_feature_tile_refresh (GsAppTile *self)
- 			 * @min_abs_contrast contrast with the foreground, so
- 			 * that the text is legible.
- 			 */
--			fg_rgba_valid = gtk_style_context_lookup_color (context, "theme_fg_color", &fg_rgba);
--			g_assert (fg_rgba_valid);
-+			if (!gtk_style_context_lookup_color (context, "theme_fg_color", &fg_rgba)) {
-+				static gboolean i_know = FALSE;
-+				if (!i_know) {
-+					i_know = TRUE;
-+					g_warning ("The theme doesn't provide 'theme_fg_color', fallbacking to black");
-+				}
-+				fg_rgba.red = 0.0;
-+				fg_rgba.green = 0.0;
-+				fg_rgba.blue = 0.0;
-+				fg_rgba.alpha = 1.0;
-+			}
- 
- 			gtk_rgb_to_hsv (fg_rgba.red, fg_rgba.green, fg_rgba.blue,
- 					&fg_hsbc.hue, &fg_hsbc.saturation, &fg_hsbc.brightness);
--- 
-GitLab
-

SOURCES/0001-fedora-langpacks-for-rhel.patch

@@ -0,0 +1,15 @@
+diff --git a/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c b/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c
+index ae91005bed..39780cc061 100644
+--- a/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c
++++ b/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c
+@@ -30,7 +30,8 @@ gs_plugin_fedora_langpacks_init (GsPluginFedoraLangpacks *self)
+ 	GsPlugin *plugin = GS_PLUGIN (self);
+ 
+ 	/* this plugin should be fedora specific */
+-	if (!gs_plugin_check_distro_id (plugin, "fedora")) {
++	if (!gs_plugin_check_distro_id (plugin, "fedora") &&
++	    !gs_plugin_check_distro_id (plugin, "rhel")) {
+ 		gs_plugin_set_enabled (plugin, FALSE);
+ 		return;
+ 	}
+

SOURCES/0006-optional-repos-cannot-be-disabled.patch

@@ -1,498 +0,0 @@
-From dca731ff0daf904911dd6815fb9a1b181329c887 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 5 Oct 2021 11:00:20 +0200
-Subject: [PATCH 1/4] gs-repo-row: Use GS_APP_QUIRK_COMPULSORY to recognize
- required repositories
-
-The GS_APP_QUIRK_PROVENANCE quirk does not mean it's also required repository,
-thus use the GS_APP_QUIRK_COMPULSORY for repos, which cannot be disabled.
-The GS_APP_QUIRK_PROVENANCE is used only for repositories, which cannot be removed.
----
- src/gs-repo-row.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/gs-repo-row.c b/src/gs-repo-row.c
-index 87926092f..bbf67c194 100644
---- a/src/gs-repo-row.c
-+++ b/src/gs-repo-row.c
-@@ -48,7 +48,8 @@ refresh_ui (GsRepoRow *row)
- 	gboolean active = FALSE;
- 	gboolean state_sensitive = FALSE;
- 	gboolean busy = priv->busy_counter> 0;
--	gboolean is_system_repo;
-+	gboolean is_provenance;
-+	gboolean is_compulsory;
- 
- 	if (priv->repo == NULL) {
- 		gtk_widget_set_sensitive (priv->disable_switch, FALSE);
-@@ -87,11 +88,12 @@ refresh_ui (GsRepoRow *row)
- 		break;
- 	}
- 
--	is_system_repo = gs_app_has_quirk (priv->repo, GS_APP_QUIRK_PROVENANCE);
-+	is_provenance = gs_app_has_quirk (priv->repo, GS_APP_QUIRK_PROVENANCE);
-+	is_compulsory = gs_app_has_quirk (priv->repo, GS_APP_QUIRK_COMPULSORY);
- 
- 	/* Disable for the system repos, if installed */
--	gtk_widget_set_sensitive (priv->disable_switch, priv->supports_enable_disable && (state_sensitive || !is_system_repo || priv->always_allow_enable_disable));
--	gtk_widget_set_visible (priv->remove_button, priv->supports_remove && !is_system_repo);
-+	gtk_widget_set_sensitive (priv->disable_switch, priv->supports_enable_disable && (state_sensitive || !is_compulsory || priv->always_allow_enable_disable));
-+	gtk_widget_set_visible (priv->remove_button, priv->supports_remove && !is_provenance && !is_compulsory);
- 
- 	/* Set only the 'state' to visually indicate the state is not saved yet */
- 	if (busy)
--- 
-GitLab
-
-
-From 026218b9d3211de243dfc49eca8b8d46633882b0 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 5 Oct 2021 11:03:31 +0200
-Subject: [PATCH 2/4] gs-plugin-provenance: Improve search speed in list of
- repositories
-
-Use a GHashTable for bare repository names and a GPtrArray for those
-with wildcards. This helps with speed, due to not traversing all
-the repository names with the fnmatch() call.
----
- plugins/core/gs-plugin-provenance.c | 55 ++++++++++++++++++++---------
- 1 file changed, 38 insertions(+), 17 deletions(-)
-
-diff --git a/plugins/core/gs-plugin-provenance.c b/plugins/core/gs-plugin-provenance.c
-index 97ff76798..a72c25a27 100644
---- a/plugins/core/gs-plugin-provenance.c
-+++ b/plugins/core/gs-plugin-provenance.c
-@@ -19,7 +19,8 @@
- 
- struct GsPluginData {
- 	GSettings		*settings;
--	gchar			**sources;
-+	GHashTable		*repos; /* gchar *name ~> NULL */
-+	GPtrArray		*wildcards; /* non-NULL, when have names with wildcards */
- };
- 
- static gchar **
-@@ -42,8 +43,24 @@ gs_plugin_provenance_settings_changed_cb (GSettings *settings,
- {
- 	GsPluginData *priv = gs_plugin_get_data (plugin);
- 	if (g_strcmp0 (key, "official-repos") == 0) {
--		g_strfreev (priv->sources);
--		priv->sources = gs_plugin_provenance_get_sources (plugin);
-+		/* The keys are stolen by the hash table, thus free only the array */
-+		g_autofree gchar **repos = NULL;
-+		g_hash_table_remove_all (priv->repos);
-+		g_clear_pointer (&priv->wildcards, g_ptr_array_unref);
-+		repos = gs_plugin_provenance_get_sources (plugin);
-+		for (guint ii = 0; repos && repos[ii]; ii++) {
-+			if (strchr (repos[ii], '*') ||
-+			    strchr (repos[ii], '?') ||
-+			    strchr (repos[ii], '[')) {
-+				if (priv->wildcards == NULL)
-+					priv->wildcards = g_ptr_array_new_with_free_func (g_free);
-+				g_ptr_array_add (priv->wildcards, g_steal_pointer (&(repos[ii])));
-+			} else {
-+				g_hash_table_insert (priv->repos, g_steal_pointer (&(repos[ii])), NULL);
-+			}
-+		}
-+		if (priv->wildcards != NULL)
-+			g_ptr_array_add (priv->wildcards, NULL);
- 	}
- }
- 
-@@ -52,9 +69,10 @@ gs_plugin_initialize (GsPlugin *plugin)
- {
- 	GsPluginData *priv = gs_plugin_alloc_data (plugin, sizeof(GsPluginData));
- 	priv->settings = g_settings_new ("org.gnome.software");
-+	priv->repos = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
- 	g_signal_connect (priv->settings, "changed",
- 			  G_CALLBACK (gs_plugin_provenance_settings_changed_cb), plugin);
--	priv->sources = gs_plugin_provenance_get_sources (plugin);
-+	gs_plugin_provenance_settings_changed_cb (priv->settings, "official-repos", plugin);
- 
- 	/* after the package source is set */
- 	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "dummy");
-@@ -66,7 +84,8 @@ void
- gs_plugin_destroy (GsPlugin *plugin)
- {
- 	GsPluginData *priv = gs_plugin_get_data (plugin);
--	g_strfreev (priv->sources);
-+	g_hash_table_unref (priv->repos);
-+	g_clear_pointer (&priv->wildcards, g_ptr_array_unref);
- 	g_object_unref (priv->settings);
- }
- 
-@@ -74,12 +93,12 @@ static gboolean
- refine_app (GsPlugin             *plugin,
- 	    GsApp                *app,
- 	    GsPluginRefineFlags   flags,
-+	    GHashTable		 *repos,
-+	    GPtrArray		 *wildcards,
- 	    GCancellable         *cancellable,
- 	    GError              **error)
- {
--	GsPluginData *priv = gs_plugin_get_data (plugin);
- 	const gchar *origin;
--	gchar **sources;
- 
- 	/* not required */
- 	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE) == 0)
-@@ -87,14 +106,10 @@ refine_app (GsPlugin             *plugin,
- 	if (gs_app_has_quirk (app, GS_APP_QUIRK_PROVENANCE))
- 		return TRUE;
- 
--	/* nothing to search */
--	sources = priv->sources;
--	if (sources == NULL || sources[0] == NULL)
--		return TRUE;
--
- 	/* simple case */
- 	origin = gs_app_get_origin (app);
--	if (origin != NULL && gs_utils_strv_fnmatch (sources, origin)) {
-+	if (origin != NULL && (g_hash_table_contains (repos, origin) ||
-+	    (wildcards != NULL && gs_utils_strv_fnmatch ((gchar **) wildcards->pdata, origin)))) {
- 		gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
- 		return TRUE;
- 	}
-@@ -103,7 +118,8 @@ refine_app (GsPlugin             *plugin,
- 	 * provenance quirk to the system-configured repositories (but not
- 	 * user-configured ones). */
- 	if (gs_app_get_kind (app) == AS_COMPONENT_KIND_REPOSITORY &&
--	    gs_utils_strv_fnmatch (sources, gs_app_get_id (app))) {
-+	    (g_hash_table_contains (repos, gs_app_get_id (app)) ||
-+	    (wildcards != NULL && gs_utils_strv_fnmatch ((gchar **) wildcards->pdata, gs_app_get_id (app))))) {
- 		if (gs_app_get_scope (app) != AS_COMPONENT_SCOPE_USER)
- 			gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
- 		return TRUE;
-@@ -118,7 +134,8 @@ refine_app (GsPlugin             *plugin,
- 		return TRUE;
- 	if (g_str_has_prefix (origin + 1, "installed:"))
- 		origin += 10;
--	if (gs_utils_strv_fnmatch (sources, origin + 1)) {
-+	if (g_hash_table_contains (repos, origin + 1) ||
-+	    (wildcards != NULL && gs_utils_strv_fnmatch ((gchar **) wildcards->pdata, origin + 1))) {
- 		gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
- 		return TRUE;
- 	}
-@@ -133,17 +150,21 @@ gs_plugin_refine (GsPlugin             *plugin,
- 		  GError              **error)
- {
- 	GsPluginData *priv = gs_plugin_get_data (plugin);
-+	g_autoptr(GHashTable) repos = NULL;
-+	g_autoptr(GPtrArray) wildcards = NULL;
- 
- 	/* nothing to do here */
- 	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE) == 0)
- 		return TRUE;
-+	repos = g_hash_table_ref (priv->repos);
-+	wildcards = priv->wildcards != NULL ? g_ptr_array_ref (priv->wildcards) : NULL;
- 	/* nothing to search */
--	if (priv->sources == NULL || priv->sources[0] == NULL)
-+	if (g_hash_table_size (repos) == 0)
- 		return TRUE;
- 
- 	for (guint i = 0; i < gs_app_list_length (list); i++) {
- 		GsApp *app = gs_app_list_index (list, i);
--		if (!refine_app (plugin, app, flags, cancellable, error))
-+		if (!refine_app (plugin, app, flags, repos, wildcards, cancellable, error))
- 			return FALSE;
- 	}
- 
--- 
-GitLab
-
-
-From b5e3356aff5fcd257248f9bb697e272c879249ae Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 5 Oct 2021 13:03:44 +0200
-Subject: [PATCH 3/4] settings: Add 'required-repos' key
-
-To be used to list repositories, which cannot be removed or disabled.
-It's a complementary option for the 'official-repos' key.
----
- data/org.gnome.software.gschema.xml | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/data/org.gnome.software.gschema.xml b/data/org.gnome.software.gschema.xml
-index db1c27ce4..0e5706b7c 100644
---- a/data/org.gnome.software.gschema.xml
-+++ b/data/org.gnome.software.gschema.xml
-@@ -94,6 +94,10 @@
-       <default>[]</default>
-       <summary>A list of official repositories that should not be considered 3rd party</summary>
-     </key>
-+    <key name="required-repos" type="as">
-+      <default>[]</default>
-+      <summary>A list of required repositories that cannot be disabled or removed</summary>
-+    </key>
-     <key name="free-repos" type="as">
-       <default>[]</default>
-       <summary>A list of official repositories that should be considered free software</summary>
--- 
-GitLab
-
-
-From d6b8b206a596bb520a0b77066898b44a5ef18920 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 5 Oct 2021 14:16:56 +0200
-Subject: [PATCH 4/4] gs-plugin-provenance: Handle also 'required-repos' key
-
-Let it handle also 'required-repos' settings key, beside the 'official-repos'
-key, which are close enough to share the same code and memory. With this
-done the repositories can be marked as compulsory, independently from the official
-repositories.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1479
----
- plugins/core/gs-plugin-provenance.c | 142 +++++++++++++++++++++-------
- 1 file changed, 108 insertions(+), 34 deletions(-)
-
-diff --git a/plugins/core/gs-plugin-provenance.c b/plugins/core/gs-plugin-provenance.c
-index a72c25a27..22f3c98e1 100644
---- a/plugins/core/gs-plugin-provenance.c
-+++ b/plugins/core/gs-plugin-provenance.c
-@@ -14,26 +14,61 @@
- /*
-  * SECTION:
-  * Sets the package provenance to TRUE if installed by an official
-- * software source.
-+ * software source. Also sets compulsory quirk when a required repository.
-  */
- 
- struct GsPluginData {
- 	GSettings		*settings;
--	GHashTable		*repos; /* gchar *name ~> NULL */
--	GPtrArray		*wildcards; /* non-NULL, when have names with wildcards */
-+	GHashTable		*repos; /* gchar *name ~> guint flags */
-+	GPtrArray		*provenance_wildcards; /* non-NULL, when have names with wildcards */
-+	GPtrArray		*compulsory_wildcards; /* non-NULL, when have names with wildcards */
- };
- 
-+static GHashTable *
-+gs_plugin_provenance_remove_by_flag (GHashTable *old_repos,
-+				     GsAppQuirk quirk)
-+{
-+	GHashTable *new_repos = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-+	GHashTableIter iter;
-+	gpointer key, value;
-+	g_hash_table_iter_init (&iter, old_repos);
-+	while (g_hash_table_iter_next (&iter, &key, &value)) {
-+		guint flags = GPOINTER_TO_UINT (value);
-+		flags = flags & (~quirk);
-+		if (flags != 0)
-+			g_hash_table_insert (new_repos, g_strdup (key), GUINT_TO_POINTER (flags));
-+	}
-+	return new_repos;
-+}
-+
-+static void
-+gs_plugin_provenance_add_quirks (GsApp *app,
-+				 guint quirks)
-+{
-+	GsAppQuirk array[] = {
-+		GS_APP_QUIRK_PROVENANCE,
-+		GS_APP_QUIRK_COMPULSORY
-+	};
-+	for (guint ii = 0; ii < G_N_ELEMENTS (array); ii++) {
-+		if ((quirks & array[ii]) != 0)
-+			gs_app_add_quirk (app, array[ii]);
-+	}
-+}
-+
- static gchar **
--gs_plugin_provenance_get_sources (GsPlugin *plugin)
-+gs_plugin_provenance_get_sources (GsPlugin *plugin,
-+				  const gchar *key)
- {
- 	GsPluginData *priv = gs_plugin_get_data (plugin);
- 	const gchar *tmp;
- 	tmp = g_getenv ("GS_SELF_TEST_PROVENANCE_SOURCES");
- 	if (tmp != NULL) {
-+		if (g_strcmp0 (key, "required-repos") == 0)
-+			return NULL;
- 		g_debug ("using custom provenance sources of %s", tmp);
- 		return g_strsplit (tmp, ",", -1);
- 	}
--	return g_settings_get_strv (priv->settings, "official-repos");
-+	return g_settings_get_strv (priv->settings, key);
- }
- 
- static void
-@@ -42,25 +77,43 @@ gs_plugin_provenance_settings_changed_cb (GSettings *settings,
- 					  GsPlugin *plugin)
- {
- 	GsPluginData *priv = gs_plugin_get_data (plugin);
-+	GsAppQuirk quirk = GS_APP_QUIRK_NONE;
-+	GPtrArray **pwildcards = NULL;
-+
- 	if (g_strcmp0 (key, "official-repos") == 0) {
-+		quirk = GS_APP_QUIRK_PROVENANCE;
-+		pwildcards = &priv->provenance_wildcards;
-+	} else if (g_strcmp0 (key, "required-repos") == 0) {
-+		quirk = GS_APP_QUIRK_COMPULSORY;
-+		pwildcards = &priv->compulsory_wildcards;
-+	}
-+
-+	if (quirk != GS_APP_QUIRK_NONE) {
- 		/* The keys are stolen by the hash table, thus free only the array */
- 		g_autofree gchar **repos = NULL;
--		g_hash_table_remove_all (priv->repos);
--		g_clear_pointer (&priv->wildcards, g_ptr_array_unref);
--		repos = gs_plugin_provenance_get_sources (plugin);
-+		g_autoptr(GHashTable) old_repos = priv->repos;
-+		g_autoptr(GPtrArray) old_wildcards = *pwildcards;
-+		GHashTable *new_repos = gs_plugin_provenance_remove_by_flag (old_repos, quirk);
-+		GPtrArray *new_wildcards = NULL;
-+		repos = gs_plugin_provenance_get_sources (plugin, key);
- 		for (guint ii = 0; repos && repos[ii]; ii++) {
--			if (strchr (repos[ii], '*') ||
--			    strchr (repos[ii], '?') ||
--			    strchr (repos[ii], '[')) {
--				if (priv->wildcards == NULL)
--					priv->wildcards = g_ptr_array_new_with_free_func (g_free);
--				g_ptr_array_add (priv->wildcards, g_steal_pointer (&(repos[ii])));
-+			gchar *repo = g_steal_pointer (&(repos[ii]));
-+			if (strchr (repo, '*') ||
-+			    strchr (repo, '?') ||
-+			    strchr (repo, '[')) {
-+				if (new_wildcards == NULL)
-+					new_wildcards = g_ptr_array_new_with_free_func (g_free);
-+				g_ptr_array_add (new_wildcards, repo);
- 			} else {
--				g_hash_table_insert (priv->repos, g_steal_pointer (&(repos[ii])), NULL);
-+				g_hash_table_insert (new_repos, repo,
-+					GUINT_TO_POINTER (quirk |
-+					GPOINTER_TO_UINT (g_hash_table_lookup (new_repos, repo))));
- 			}
- 		}
--		if (priv->wildcards != NULL)
--			g_ptr_array_add (priv->wildcards, NULL);
-+		if (new_wildcards != NULL)
-+			g_ptr_array_add (new_wildcards, NULL);
-+		priv->repos = new_repos;
-+		*pwildcards = new_wildcards;
- 	}
- }
- 
-@@ -73,6 +126,7 @@ gs_plugin_initialize (GsPlugin *plugin)
- 	g_signal_connect (priv->settings, "changed",
- 			  G_CALLBACK (gs_plugin_provenance_settings_changed_cb), plugin);
- 	gs_plugin_provenance_settings_changed_cb (priv->settings, "official-repos", plugin);
-+	gs_plugin_provenance_settings_changed_cb (priv->settings, "required-repos", plugin);
- 
- 	/* after the package source is set */
- 	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "dummy");
-@@ -85,20 +139,42 @@ gs_plugin_destroy (GsPlugin *plugin)
- {
- 	GsPluginData *priv = gs_plugin_get_data (plugin);
- 	g_hash_table_unref (priv->repos);
--	g_clear_pointer (&priv->wildcards, g_ptr_array_unref);
-+	g_clear_pointer (&priv->provenance_wildcards, g_ptr_array_unref);
-+	g_clear_pointer (&priv->compulsory_wildcards, g_ptr_array_unref);
- 	g_object_unref (priv->settings);
- }
- 
-+static gboolean
-+gs_plugin_provenance_find_repo_flags (GHashTable *repos,
-+				      GPtrArray *provenance_wildcards,
-+				      GPtrArray *compulsory_wildcards,
-+				      const gchar *repo,
-+				      guint *out_flags)
-+{
-+	if (repo == NULL || *repo == '\0')
-+		return FALSE;
-+	*out_flags = GPOINTER_TO_UINT (g_hash_table_lookup (repos, repo));
-+	if (provenance_wildcards != NULL &&
-+	    gs_utils_strv_fnmatch ((gchar **) provenance_wildcards->pdata, repo))
-+		*out_flags |= GS_APP_QUIRK_PROVENANCE;
-+	if (compulsory_wildcards != NULL &&
-+	    gs_utils_strv_fnmatch ((gchar **) compulsory_wildcards->pdata, repo))
-+		*out_flags |= GS_APP_QUIRK_COMPULSORY;
-+	return *out_flags != 0;
-+}
-+
- static gboolean
- refine_app (GsPlugin             *plugin,
- 	    GsApp                *app,
- 	    GsPluginRefineFlags   flags,
- 	    GHashTable		 *repos,
--	    GPtrArray		 *wildcards,
-+	    GPtrArray		 *provenance_wildcards,
-+	    GPtrArray		 *compulsory_wildcards,
- 	    GCancellable         *cancellable,
- 	    GError              **error)
- {
- 	const gchar *origin;
-+	guint quirks;
- 
- 	/* not required */
- 	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE) == 0)
-@@ -108,9 +184,8 @@ refine_app (GsPlugin             *plugin,
- 
- 	/* simple case */
- 	origin = gs_app_get_origin (app);
--	if (origin != NULL && (g_hash_table_contains (repos, origin) ||
--	    (wildcards != NULL && gs_utils_strv_fnmatch ((gchar **) wildcards->pdata, origin)))) {
--		gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
-+	if (gs_plugin_provenance_find_repo_flags (repos, provenance_wildcards, compulsory_wildcards, origin, &quirks)) {
-+		gs_plugin_provenance_add_quirks (app, quirks);
- 		return TRUE;
- 	}
- 
-@@ -118,10 +193,9 @@ refine_app (GsPlugin             *plugin,
- 	 * provenance quirk to the system-configured repositories (but not
- 	 * user-configured ones). */
- 	if (gs_app_get_kind (app) == AS_COMPONENT_KIND_REPOSITORY &&
--	    (g_hash_table_contains (repos, gs_app_get_id (app)) ||
--	    (wildcards != NULL && gs_utils_strv_fnmatch ((gchar **) wildcards->pdata, gs_app_get_id (app))))) {
-+	    gs_plugin_provenance_find_repo_flags (repos, provenance_wildcards, compulsory_wildcards, gs_app_get_id (app), &quirks)) {
- 		if (gs_app_get_scope (app) != AS_COMPONENT_SCOPE_USER)
--			gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
-+			gs_plugin_provenance_add_quirks (app, quirks);
- 		return TRUE;
- 	}
- 
-@@ -134,11 +208,9 @@ refine_app (GsPlugin             *plugin,
- 		return TRUE;
- 	if (g_str_has_prefix (origin + 1, "installed:"))
- 		origin += 10;
--	if (g_hash_table_contains (repos, origin + 1) ||
--	    (wildcards != NULL && gs_utils_strv_fnmatch ((gchar **) wildcards->pdata, origin + 1))) {
--		gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
--		return TRUE;
--	}
-+	if (gs_plugin_provenance_find_repo_flags (repos, provenance_wildcards, compulsory_wildcards, origin + 1, &quirks))
-+		gs_plugin_provenance_add_quirks (app, quirks);
-+
- 	return TRUE;
- }
- 
-@@ -151,20 +223,22 @@ gs_plugin_refine (GsPlugin             *plugin,
- {
- 	GsPluginData *priv = gs_plugin_get_data (plugin);
- 	g_autoptr(GHashTable) repos = NULL;
--	g_autoptr(GPtrArray) wildcards = NULL;
-+	g_autoptr(GPtrArray) provenance_wildcards = NULL;
-+	g_autoptr(GPtrArray) compulsory_wildcards = NULL;
- 
- 	/* nothing to do here */
- 	if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE) == 0)
- 		return TRUE;
- 	repos = g_hash_table_ref (priv->repos);
--	wildcards = priv->wildcards != NULL ? g_ptr_array_ref (priv->wildcards) : NULL;
-+	provenance_wildcards = priv->provenance_wildcards != NULL ? g_ptr_array_ref (priv->provenance_wildcards) : NULL;
-+	compulsory_wildcards = priv->compulsory_wildcards != NULL ? g_ptr_array_ref (priv->compulsory_wildcards) : NULL;
- 	/* nothing to search */
--	if (g_hash_table_size (repos) == 0)
-+	if (g_hash_table_size (repos) == 0 && provenance_wildcards == NULL && compulsory_wildcards == NULL)
- 		return TRUE;
- 
- 	for (guint i = 0; i < gs_app_list_length (list); i++) {
- 		GsApp *app = gs_app_list_index (list, i);
--		if (!refine_app (plugin, app, flags, repos, wildcards, cancellable, error))
-+		if (!refine_app (plugin, app, flags, repos, provenance_wildcards, compulsory_wildcards, cancellable, error))
- 			return FALSE;
- 	}
- 
--- 
-GitLab
-

SOURCES/0007-compulsory-only-for-repos.patch

@@ -1,42 +0,0 @@
-From 895d1ca748f4f33a852853f5f07903fb549fb66f Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 11 Oct 2021 09:13:59 +0200
-Subject: [PATCH] gs-plugin-provenance: Set COMPULSORY quirk only on REPOSITORY
- apps
-
-The compulsory quirk related to repositories, which cannot be removed,
-not to the applications provided by those repositories, thus set that
-quirk only on repositories, not on the apps from it.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1488
----
- plugins/core/gs-plugin-provenance.c | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/core/gs-plugin-provenance.c b/plugins/core/gs-plugin-provenance.c
-index 22f3c98e..e44a55f0 100644
---- a/plugins/core/gs-plugin-provenance.c
-+++ b/plugins/core/gs-plugin-provenance.c
-@@ -45,14 +45,11 @@ static void
- gs_plugin_provenance_add_quirks (GsApp *app,
- 				 guint quirks)
- {
--	GsAppQuirk array[] = {
--		GS_APP_QUIRK_PROVENANCE,
--		GS_APP_QUIRK_COMPULSORY
--	};
--	for (guint ii = 0; ii < G_N_ELEMENTS (array); ii++) {
--		if ((quirks & array[ii]) != 0)
--			gs_app_add_quirk (app, array[ii]);
--	}
-+	if ((quirks & GS_APP_QUIRK_PROVENANCE) != 0)
-+		gs_app_add_quirk (app, GS_APP_QUIRK_PROVENANCE);
-+	if ((quirks & GS_APP_QUIRK_COMPULSORY) != 0 &&
-+	    gs_app_get_kind (app) == AS_COMPONENT_KIND_REPOSITORY)
-+		gs_app_add_quirk (app, GS_APP_QUIRK_COMPULSORY);
- }
- 
- static gchar **
--- 
-2.31.1
-

SOURCES/0008-gs-removal-dialog-crrect-property-name.patch

@@ -1,12 +0,0 @@
-diff -up gnome-software-41.5/src/gs-removal-dialog.ui.4 gnome-software-41.5/src/gs-removal-dialog.ui
---- gnome-software-41.5/src/gs-removal-dialog.ui.4	2022-09-12 08:59:57.819169830 +0200
-+++ gnome-software-41.5/src/gs-removal-dialog.ui	2022-09-12 09:00:25.148201673 +0200
-@@ -20,7 +20,7 @@
-     </child>
-   </object>
-   <template class="GsRemovalDialog" parent="GtkMessageDialog">
--    <property name="text" translatable="yes">Incompatible Software</property>
-+    <property name="title" translatable="yes">Incompatible Software</property>
-     <property name="modal">True</property>
-     <property name="destroy_with_parent">True</property>
-     <child type="action">

SOURCES/0009-hide-some-errors.patch

@@ -1,70 +0,0 @@
-From 19c19d37ec9ba8b15b806158572a8e4a34c55677 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 7 Sep 2022 09:01:16 +0200
-Subject: [PATCH] misc: Hide some errors in non-debug builds
-
-These two errors are useless for the users, they cannot do anything with them.
-While it can be useful to know them, they can be also disturbing and they just
-fill the journal log for the users.
-
-Related to https://gitlab.gnome.org/GNOME/gnome-software/-/issues/753
----
- lib/gs-plugin-loader.c | 15 +++++++++++----
- src/gs-shell.c         | 15 +++++++++++----
- 2 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
-index 63f741c37..e040358b7 100644
---- a/lib/gs-plugin-loader.c
-+++ b/lib/gs-plugin-loader.c
-@@ -358,10 +358,17 @@ gs_plugin_loader_claim_error (GsPluginLoader *plugin_loader,
- 
- 	/* invalid */
- 	if (error_copy->domain != GS_PLUGIN_ERROR) {
--		g_warning ("not GsPlugin error %s:%i: %s",
--			   g_quark_to_string (error_copy->domain),
--			   error_copy->code,
--			   error_copy->message);
-+		if (g_strcmp0 (BUILD_TYPE, "debug") == 0) {
-+			g_warning ("not GsPlugin error %s:%i: %s",
-+				   g_quark_to_string (error_copy->domain),
-+				   error_copy->code,
-+				   error_copy->message);
-+		} else {
-+			g_debug ("not GsPlugin error %s:%i: %s",
-+				 g_quark_to_string (error_copy->domain),
-+				 error_copy->code,
-+				 error_copy->message);
-+		}
- 		error_copy->domain = GS_PLUGIN_ERROR;
- 		error_copy->code = GS_PLUGIN_ERROR_FAILED;
- 	}
-diff --git a/src/gs-shell.c b/src/gs-shell.c
-index beb76f0e9..af297d240 100644
---- a/src/gs-shell.c
-+++ b/src/gs-shell.c
-@@ -2080,10 +2080,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;
--- 
-GitLab
-

SPECS/gnome-software.spec

@@ -1,61 +1,85 @@
-%global appstream_version 0.14.0
+%global appstream_version 1.0.0~
+%global flatpak_version 1.9.1
+%global fwupd_version 1.5.6
+%global glib2_version 2.70.0
+%global gtk4_version 4.10.0
+%global json_glib_version 1.6.0
+%global libadwaita_version 1.3.alpha
 %global libxmlb_version 0.1.7
-%global glib2_version 2.61.1
-%global gtk3_version 3.22.4
-%global json_glib_version 1.2.0
-%global libsoup_version 2.52.0
-%global packagekit_version 1.1.1
-%global fwupd_version 1.3.3
-%global flatpak_version 1.5.1
+%global packagekit_version 1.2.5
+
+# Disable WebApps for RHEL builds
+%bcond webapps %[!0%{?rhel}]
+# Disable parental control for RHEL builds
+%bcond malcontent %[!0%{?rhel}]
+# Disable rpm-ostree support for RHEL builds
+%bcond rpmostree %[!0%{?rhel}]
+# this is to be able to disable fedora-langpacks subpackage build
+%bcond langpacks %[1]
+
+# this is not a library version
+%define gs_plugin_version 20
 
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
+%global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$
+
 Name:      gnome-software
-Version:   41.5
-Release:   3%{?dist}
+Version:   46.4
+Release:   1%{?dist}
 Summary:   A software center for GNOME
 
-License:   GPLv2+
-URL:       https://wiki.gnome.org/Apps/Software
-Source0:   https://download.gnome.org/sources/gnome-software/41/%{name}-%{tarball_version}.tar.xz
+License:   GPL-2.0-or-later
+URL:       https://apps.gnome.org/Software
+Source0:   https://download.gnome.org/sources/gnome-software/46/%{name}-%{tarball_version}.tar.xz
 
-Patch01:   0001-crash-with-broken-theme.patch
-Patch02:   0006-optional-repos-cannot-be-disabled.patch
-Patch03:   0007-compulsory-only-for-repos.patch
-Patch04:   0008-gs-removal-dialog-crrect-property-name.patch
-Patch05:   0009-hide-some-errors.patch
+Patch:     0001-fedora-langpacks-for-rhel.patch
+
+# ostree and flatpak not on i686 for RHEL 10
+# https://github.com/containers/composefs/pull/229#issuecomment-1838735764
+%if 0%{?rhel} >= 10
+ExcludeArch:    %{ix86}
+%endif
 
-BuildRequires: appstream-devel >= %{appstream_version}
-BuildRequires: gcc
-BuildRequires: gettext
-BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 BuildRequires: desktop-file-utils
-BuildRequires: fwupd-devel >= %{fwupd_version}
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gnome-online-accounts-devel
-BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: gspell-devel
-BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: gcc
+BuildRequires: gettext
 BuildRequires: gtk-doc
-BuildRequires: json-glib-devel >= %{json_glib_version}
-BuildRequires: libdnf-devel
-BuildRequires: libhandy1-devel
-BuildRequires: libsoup-devel
-BuildRequires: libxmlb-devel >= %{libxmlb_version}
+BuildRequires: libxslt
 BuildRequires: meson
-BuildRequires: PackageKit-glib-devel >= %{packagekit_version}
-BuildRequires: polkit-devel
-BuildRequires: flatpak-devel >= %{flatpak_version}
-BuildRequires: ostree-devel
-BuildRequires: rpm-devel
-BuildRequires: rpm-ostree-devel
-BuildRequires: libgudev1-devel
-BuildRequires: sysprof-capture-devel
-BuildRequires: valgrind-devel
+BuildRequires: pkgconfig(appstream) >= %{appstream_version}
+BuildRequires: pkgconfig(flatpak) >= %{flatpak_version}
+BuildRequires: pkgconfig(fwupd) >= %{fwupd_version}
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
+BuildRequires: pkgconfig(gudev-1.0)
+BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
+BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version}
+BuildRequires: pkgconfig(libdnf)
+BuildRequires: pkgconfig(libsoup-3.0)
+%if %{with malcontent}
+BuildRequires: pkgconfig(malcontent-0)
+%endif
+BuildRequires: pkgconfig(ostree-1)
+BuildRequires: pkgconfig(packagekit-glib2) >= %{packagekit_version}
+BuildRequires: pkgconfig(polkit-gobject-1)
+BuildRequires: pkgconfig(rpm)
+%if %{with rpmostree}
+BuildRequires: pkgconfig(rpm-ostree-1)
+%endif
+BuildRequires: pkgconfig(sysprof-capture-4)
+BuildRequires: pkgconfig(xmlb) >= %{libxmlb_version}
 
 Requires: appstream-data
 Requires: appstream%{?_isa} >= %{appstream_version}
+%if %{with webapps}
+Requires: epiphany-runtime%{?_isa}
+%endif
 Requires: flatpak%{?_isa} >= %{flatpak_version}
 Requires: flatpak-libs%{?_isa} >= %{flatpak_version}
 Requires: fwupd%{?_isa} >= %{fwupd_version}
@@ -63,22 +87,20 @@ Requires: glib2%{?_isa} >= %{glib2_version}
 # gnome-menus is needed for app folder .directory entries
 Requires: gnome-menus%{?_isa}
 Requires: gsettings-desktop-schemas%{?_isa}
-Requires: gtk3%{?_isa} >= %{gtk3_version}
 Requires: json-glib%{?_isa} >= %{json_glib_version}
 Requires: iso-codes
 # librsvg2 is needed for gdk-pixbuf svg loader
 Requires: librsvg2%{?_isa}
-Requires: libsoup%{?_isa} >= %{libsoup_version}
 Requires: libxmlb%{?_isa} >= %{libxmlb_version}
 
 Recommends: PackageKit%{?_isa} >= %{packagekit_version}
+%if %{with langpacks}
+Recommends: %{name}-fedora-langpacks
+%endif
 
 Obsoletes: gnome-software-snap < 3.33.1
 Obsoletes: gnome-software-editor < 3.35.1
 
-# this is not a library version
-%define gs_plugin_version               16
-
 %description
 gnome-software is an application that makes it easy to add, remove
 and update software in the GNOME desktop.
@@ -91,6 +113,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 These development files are for building gnome-software plugins outside
 the source tree. Most users do not need this subpackage installed.
 
+%if %{with langpacks}
+%package fedora-langpacks
+Summary: Contains fedora-langpacks plugin
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description fedora-langpacks
+The fedora-langpacks plugin ensures langpacks packages are installed
+for the current locale.
+%endif
+
+%if %{with rpmostree}
 %package rpm-ostree
 Summary: rpm-ostree backend for gnome-software
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -102,18 +135,38 @@ gnome-software is an application that makes it easy to add, remove
 and update software in the GNOME desktop.
 
 This package includes the rpm-ostree backend.
+%endif
 
 %prep
-%autosetup -p1 -n %{name}-%{tarball_version} -S gendiff
+%autosetup -p1 -S gendiff -n %{name}-%{tarball_version}
 
 %build
 %meson \
+    -Dsoup2=false \
     -Dsnap=false \
+%if %{with malcontent}
+    -Dmalcontent=true \
+%else
     -Dmalcontent=false \
+%endif
     -Dgudev=true \
     -Dpackagekit=true \
+    -Dpackagekit_autoremove=true \
     -Dexternal_appstream=false \
+%if %{with rpmostree}
     -Drpm_ostree=true \
+%else
+    -Drpm_ostree=false \
+%endif
+%if %{with webapps}
+    -Dwebapps=true \
+    -Dhardcoded_foss_webapps=true \
+    -Dhardcoded_proprietary_webapps=false \
+%else
+    -Dwebapps=false \
+    -Dhardcoded_foss_webapps=false \
+    -Dhardcoded_proprietary_webapps=false \
+%endif
     -Dtests=false
 %meson_build
 
@@ -123,6 +176,10 @@ This package includes the rpm-ostree backend.
 # remove unneeded dpkg plugin
 rm %{buildroot}%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so
 
+%if !%{with langpacks}
+rm %{buildroot}%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
+%endif
+
 # make the software center load faster
 desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
     --set-key=X-AppInstall-Package --set-value=%{name}
@@ -135,6 +192,7 @@ official-repos = [ 'rhel-%{?rhel}' ]
 %else
 official-repos = [ 'anaconda', 'fedora', 'fedora-debuginfo', 'fedora-source', 'koji-override-0', 'koji-override-1', 'rawhide', 'rawhide-debuginfo', 'rawhide-source', 'updates', 'updates-debuginfo', 'updates-source', 'updates-testing', 'updates-testing-debuginfo', 'updates-testing-source', 'fedora-modular', 'fedora-modular-debuginfo', 'fedora-modular-source', 'rawhide-modular', 'rawhide-modular-debuginfo', 'rawhide-modular-source', 'fedora-cisco-openh264', 'fedora-cisco-openh264-debuginfo' ]
 required-repos = [ 'fedora', 'updates' ]
+packaging-format-preference = [ 'flatpak:fedora-testing', 'flatpak:fedora', 'rpm' ]
 %endif
 FOE
 
@@ -147,44 +205,51 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %doc AUTHORS README.md
 %license COPYING
 %{_bindir}/gnome-software
-%{_datadir}/applications/gnome-software-local-file.desktop
+%{_datadir}/applications/gnome-software-local-file-flatpak.desktop
+%{_datadir}/applications/gnome-software-local-file-fwupd.desktop
+%{_datadir}/applications/gnome-software-local-file-packagekit.desktop
 %{_datadir}/applications/org.gnome.Software.desktop
-%dir %{_datadir}/gnome-software
-%{_datadir}/gnome-software/*.png
-%{_mandir}/man1/gnome-software.1.gz
+%{_datadir}/bash-completion/completions/gnome-software
+%{_mandir}/man1/gnome-software.1*
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Software.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Software-symbolic.svg
 %{_datadir}/icons/hicolor/scalable/actions/app-remove-symbolic.svg
-%{_datadir}/icons/hicolor/scalable/actions/carousel-arrow-next-symbolic.svg
-%{_datadir}/icons/hicolor/scalable/actions/carousel-arrow-previous-symbolic.svg
-%{_datadir}/icons/hicolor/scalable/status/software-installed-symbolic.svg
-%{_datadir}/metainfo/org.gnome.Software.appdata.xml
+%{_datadir}/metainfo/org.gnome.Software.metainfo.xml
+%if %{with webapps}
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Epiphany.metainfo.xml
+%endif
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
 %{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
 %dir %{_libdir}/gnome-software/plugins-%{gs_plugin_version}
 %{_libdir}/gnome-software/libgnomesoftware.so.%{gs_plugin_version}
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_appstream.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_dummy.so
-%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
+%if %{with webapps}
+%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so
+%endif
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-pkgdb-collections.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_flatpak.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fwupd.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_generic-updates.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-blocklist.so
-%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_icons.so
+%if %{with malcontent}
+%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_malcontent.so
+%endif
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_modalias.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_os-release.so
-%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refine-repos.so
-%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refresh.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_packagekit.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_provenance-license.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_provenance.so
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_repos.so
-%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_rewrite-resource.so
-%{_libdir}/gnome-software/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
+%{_sysconfdir}/xdg/autostart/org.gnome.Software.desktop
+%dir %{_datadir}/swcatalog
+%dir %{_datadir}/swcatalog/xml
+%if %{with webapps}
+%{_datadir}/swcatalog/xml/gnome-pwa-list-foss.xml
+%endif
+%{_datadir}/swcatalog/xml/org.gnome.Software.Curated.xml
+%{_datadir}/swcatalog/xml/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
@@ -193,87 +258,285 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libexecdir}/gnome-software-cmd
 %{_libexecdir}/gnome-software-restarter
 
+%if %{with langpacks}
+%files fedora-langpacks
+%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
+%endif
+
+%if %{with rpmostree}
 %files rpm-ostree
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_rpm-ostree.so
+%endif
 
 %files devel
 %{_libdir}/pkgconfig/gnome-software.pc
 %dir %{_includedir}/gnome-software
 %{_includedir}/gnome-software/*.h
 %{_libdir}/gnome-software/libgnomesoftware.so
-%{_datadir}/gtk-doc/html/gnome-software
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/gnome-software/
 
 %changelog
-* Thu Aug 03 2023 Milan Crha <mcrha@redhat.com> - 41.5-3
-- Resolves: #2228374 (Rebuild to move gnome-software-devel into CRB)
+* Mon Aug 19 2024 Milan Crha <mcrha@redhat.com> - 46.4-1
+- Resolves: RHEL-52807 (Update to 46.4)
+
+* Mon Jul 08 2024 Milan Crha <mcrha@redhat.com> - 46.3-2
+- Resolves: RHEL-39680 (Re-enable build of the fedora-langpacks subpackage in RHEL)
+
+* Mon Jul 01 2024 Milan Crha <mcrha@redhat.com> - 46.3-1
+- Resolves: RHEL-45603 (Update to 46.3)
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.2-3
+- Bump release for June 2024 mass rebuild
+
+* Mon Jun 03 2024 Milan Crha <mcrha@redhat.com> - 46.2-2
+- Resolves: RHEL-39680 (Build fedora-langpacks subpackage only in Fedora)
+
+* Tue May 28 2024 Milan Crha <mcrha@redhat.com> - 46.2-1
+- Resolves: RHEL-38644 (Update to 46.2)
+
+* Mon Apr 29 2024 Milan Crha <mcrha@redhat.com> - 46.1-1
+- Resolves: RHEL-34658 (Update to 46.1)
+
+* Mon Mar 25 2024 Milan Crha <mcrha@redhat.com> - 46.0-1
+- Resolves: RHEL-30226 (Backport Fedora 40 changes)
+- Update to 46.0
+
+* Fri Feb 09 2024 Milan Crha <mcrha@redhat.com> - 46~beta-1
+- Update to 46.beta
+
+* Fri Jan 26 2024 Milan Crha <mcrha@redhat.com> - 46~alpha-4
+- Resolves: #2260294 (Split fedora-langpacks plugin into a subpackage)
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 46~alpha-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 46~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 05 2024 Milan Crha <mcrha@redhat.com> - 46~alpha-1
+- Update to 46.alpha
+
+* Fri Dec 01 2023 Milan Crha <mcrha@redhat.com> - 45.2-1
+- Update to 45.2
+
+* Tue Nov 07 2023 Neal Gompa <ngompa@fedoraproject.org> - 45.1-3
+- Fix appstream_version macro for prerelease appstream 1.0 package
 
-* Thu Sep 22 2022 Milan Crha <mcrha@redhat.com> - 41.5-2
-- Resolves: #2128812 (Correct property name in GsRemovalDialog .ui file)
-- Resolves: #2129021 (Hide some errors in non-debug builds)
+* Tue Nov 07 2023 Milan Crha <mcrha@redhat.com> - 45.1-2
+- Add patch to build with appstream 1.0
 
-* Mon Mar 21 2022 Milan Crha <mcrha@redhat.com> - 41.5-1
-- Resolves: #2066164 (Update to 41.5)
+* Fri Oct 20 2023 Milan Crha <mcrha@redhat.com> - 45.1-1
+- Update to 45.1
 
-* Mon Feb 14 2022 Milan Crha <mcrha@redhat.com> - 41.4-1
-- Resolves: #2054082 (Update to 41.4)
+* Fri Sep 15 2023 Milan Crha <mcrha@redhat.com> - 45.0-1
+- Update to 45.0
 
-* Mon Jan 31 2022 Milan Crha <mcrha@redhat.com> - 41.3-2
-- Resolves: #2048397 (Optional software repos can't be disabled)
+* Fri Sep 01 2023 Milan Crha <mcrha@redhat.com> - 45~rc-1
+- Update to 45.rc
 
-* Mon Jan 10 2022 Milan Crha <mcrha@redhat.com> - 41.3-1
-- Resolves: #2038805 (Update to 41.3)
+* Mon Jul 31 2023 Milan Crha <mcrha@redhat.com> - 45~beta-1
+- Update to 45.beta
 
-* Mon Dec 06 2021 Milan Crha <mcrha@redhat.com> - 41.2-1
-- Resolves: #2029323 (Update to 41.2)
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 45~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
-* Mon Nov 01 2021 Milan Crha <mcrha@redhat.com> - 41.1-1
-- Resolves: #2018871 (Update to 41.1)
+* Fri Jun 30 2023 Milan Crha <mcrha@redhat.com> - 45~alpha-1
+- Update to 45.alpha
 
-* Tue Oct 12 2021 Milan Crha <mcrha@redhat.com> - 41.0-2
-- Resolves: #2012699 (Backport changes from Fedora 35)
+* Thu Jun 22 2023 Tomas Popela <tpopela@redhat.com> - 44.2-2
+- Disable parental control (through malcontent) and rpm-ostree support in RHEL
+
+* Fri May 26 2023 Milan Crha <mcrha@redhat.com> - 44.2-1
+- Update to 44.2
+
+* Fri May 19 2023 Milan Crha <mcrha@redhat.com> - 44.1-2
+- Rebuild for RPM
+
+* Fri Apr 21 2023 Milan Crha <mcrha@redhat.com> - 44.1-1
+- Update to 44.1
+
+* Sun Mar 26 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 44.0-3
+- Fix libsoup runtime dependency
+
+* Fri Mar 24 2023 Milan Crha <mcrha@redhat.com> - 44.0-2
+- Resolves: #2181367 (Prefer Fedora Flatpaks before RPM before other sources for apps)
+
+* Fri Mar 17 2023 Milan Crha <mcrha@redhat.com> - 44.0-1
+- Update to 44.0
+
+* Fri Mar 03 2023 Milan Crha <mcrha@redhat.com> - 44~rc-1
+- Update to 44.rc
+
+* Thu Feb 23 2023 Adam Williamson <awilliam@redhat.com> - 44~beta-2
+- Backport MR #1635 to fix update notifications
+
+* Tue Feb 14 2023 Milan Crha <mcrha@redhat.com> - 44.beta-1
+- Update to 44.beta
+
+* Thu Feb 09 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 44~alpha-3
+- Switch to libsoup 3
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 44~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 09 2023 Milan Crha <mcrha@redhat.com> - 44.alpha-1
+- Update to 44.alpha
+
+* Fri Dec 02 2022 Milan Crha <mcrha@redhat.com> - 43.2-1
+- Update to 43.2
+
+* Tue Nov 08 2022 Milan Crha <mcrha@redhat.com> - 43.1-3
+- Also skip gnome-pwa-list-foss.xml when building without WebApps
+
+* Tue Nov 08 2022 Milan Crha <mcrha@redhat.com> - 43.1-2
+- Disable WebApps for RHEL builds
+
+* Mon Oct 24 2022 Milan Crha <mcrha@redhat.com> - 43.1-1
+- Update to 43.1
+
+* Wed Oct 05 2022 Milan Crha <mcrha@redhat.com> - 43.0-3
+- Resolves: #2132292 (rpm-ostree plugin refuses to update)
+
+* Tue Sep 27 2022 Kalev Lember <klember@redhat.com> - 43.0-2
+- Rebuild to fix sysprof-capture symbols leaking into libraries consuming it
+
+* Fri Sep 16 2022 Milan Crha <mcrha@redhat.com> - 43.0-1
+- Update to 43.0
+
+* Tue Sep 13 2022 Milan Crha <mcrha@redhat.com> - 43.rc-2
+- Resolves: #2124869 (Cannot install RPM package file)
+
+* Fri Sep 02 2022 Milan Crha <mcrha@redhat.com> - 43.rc-1
+- Update to 43.rc
+
+* Wed Aug 17 2022 Milan Crha <mcrha@redhat.com> - 43.beta-3
+- Resolves: #2119089 (No enough apps to show for the "Editor's Choice" section)
+
+* Mon Aug 15 2022 Milan Crha <mcrha@redhat.com> - 43.beta-2
+- Add patch for install-queue
+
+* Fri Aug 05 2022 Milan Crha <mcrha@redhat.com> - 43.beta-1
+- Update to 43.beta
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43.alpha-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 07 2022 Adam Williamson <awilliam@redhat.com> - 43.alpha-2
+- Backport MR #1401 to fix issue #1816 and fedora-workstation #107
+
+* Fri Jul 01 2022 Milan Crha <mcrha@redhat.com> - 43.alpha-1
+- Update to 43.alpha
+
+* Fri Jun 17 2022 Richard Hughes <rhughes@redhat.com> - 42.2-4
+- Add patch to make fwupd user requests work
+
+* Thu Jun 16 2022 David King <amigadave@amigadave.com> - 42.2-3
+- Filter private libraries from Provides
+- Use pkgconfig for BuildRequires
+- Improve directory onwership
+
+* Mon Jun 13 2022 Milan Crha <mcrha@redhat.com> - 42.2-2
+- Add patch for crash under gs_flatpak_refine_app_unlocked()
+
+* Mon May 30 2022 Milan Crha <mcrha@redhat.com> - 42.2-1
+- Update to 42.2
+- Add patch to correct order of the setup of the GsShell
+
+* Wed Apr 27 2022 Milan Crha <mcrha@redhat.com> - 42.1-1
+- Update to 42.1
+
+* Fri Mar 18 2022 Milan Crha <mcrha@redhat.com> - 42.0-1
+- Update to 42.0
+
+* Thu Mar 10 2022 Milan Crha <mcrha@redhat.com> - 42.rc-2
+- Add upstream patches for gs-download-utils (i#1677 and i#1679)
+
+* Mon Mar 07 2022 Milan Crha <mcrha@redhat.com> - 42.rc-1
+- Update to 42.rc
+
+* Mon Feb 21 2022 Milan Crha <mcrha@redhat.com> - 42.beta-3
+- Resolves: #2056082 (Enable PackageKit autoremove option)
+
+* Wed Feb 16 2022 Milan Crha <mcrha@redhat.com> - 42.beta-2
+- Resolves: #2054939 (Crash on a PackageKit app install)
+- Add a temporary workaround for gtk_widget_measure error flood on GsAppRow
+
+* Fri Feb 11 2022 Milan Crha <mcrha@redhat.com> - 42.beta-1
+- Update to 42.beta
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 07 2022 Milan Crha <mcrha@redhat.com> - 42.alpha-1
+- Update to 42.alpha
+
+* Fri Dec 03 2021 Milan Crha <mcrha@redhat.com> - 41.2-1
+- Update to 41.2
+
+* Fri Oct 29 2021 Milan Crha <mcrha@redhat.com> - 41.1-1
+- Update to 41.1
+
+* Tue Oct 19 2021 Milan Crha <mcrha@redhat.com> - 41.0-6
+- Resolves: #2012863 (gs-installed-page: Change section on application state change)
+
+* Mon Oct 11 2021 Milan Crha <mcrha@redhat.com> - 41.0-5
 - Add patch to mark compulsory only repos, not apps from it
+
+* Fri Oct 08 2021 Milan Crha <mcrha@redhat.com> - 41.0-4
 - Resolves: #2011176 (flathub repo can't be added through gnome-software)
 - Resolves: #2010660 (gs-repos-dialog: Can show also desktop applications)
 - Resolves: #2010353 (Optional repos cannot be disabled)
+
+* Thu Oct 07 2021 Milan Crha <mcrha@redhat.com> - 41.0-3
 - Resolves: #2010740 (Refresh on repository setup change)
+
+* Mon Oct 04 2021 Milan Crha <mcrha@redhat.com> - 41.0-2
 - Resolves: #2009063 (Correct update notifications)
 
 * Mon Sep 20 2021 Milan Crha <mcrha@redhat.com> - 41.0-1
-- Resolves: #2005770 (Update to 41.0)
+- Update to 41.0
+
+* Mon Sep 13 2021 Milan Crha <mcrha@redhat.com> - 41~rc-2
+- Resolves: #2003365 (packagekit: Ensure PkClient::interactive flag being set)
+
+* Wed Sep 08 2021 Milan Crha <mcrha@redhat.com> - 41~rc-1
+- Update to 41.rc
 
-* Mon Aug 23 2021 Kalev Lember <klember@redhat.com> - 41~beta-1
-- Resolves: #1995567 (Update to 41.beta)
+* Wed Sep 01 2021 Milan Crha <mcrha@redhat.com> - 41~beta-3
+- Resolves: #1995817 (gs-updates-section: Check also dependencies' download size)
 
-* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 40.4-1
-- Resolves: #1992452 (Update to 40.4)
+* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 41~beta-2
+- Enable parental controls support
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.3-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 41~beta-1
+- Update to 41.beta
 
-* Mon Jul 19 2021 Milan Crha <mcrha@redhat.com> - 40.3-2
-- Resolves: #1983553
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 41~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 21 2021 Milan Crha <mcrha@redhat.com> - 41~alpha-1
+- Update to 41.alpha
+
+* Mon Jul 12 2021 Milan Crha <mcrha@redhat.com> - 40.3-2
 - Add rpm-ostree patch to hide packages from the search results
 - Add patch to implement what-provides search in the Flatpak plugin
 
 * Mon Jul 12 2021 Milan Crha <mcrha@redhat.com> - 40.3-1
-- Related: #1981296 (Update to 40.3)
+- Update to 40.3
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 40.2-2
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
+* Wed Jun 23 2021 Milan Crha <mcrha@redhat.com> - 40.2-2
+- Add patch to automatically install application updates (i#1248)
 
 * Fri Jun 04 2021 Milan Crha <mcrha@redhat.com> - 40.2-1
-- Related: #1967855 (Update to 40.2)
+- Update to 40.2
 
 * Mon May 03 2021 Milan Crha <mcrha@redhat.com> - 40.1-2
-- Related: #1952776 (Add patch for crash under gs_details_page_refresh_all() (i#1227))
+- Add patch for crash under gs_details_page_refresh_all() (i#1227)
 
 * Mon May 03 2021 Milan Crha <mcrha@redhat.com> - 40.1-1
-- Related: #1952776 (Update to 40.1)
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Update to 40.1
 
 * Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.0-2
 - Rebuild to fix sysprof-capture symbols leaking into libraries consuming it