diff --git a/SOURCES/0001-epiphany-Don-t-adopt-apps-that-have-package-name-set.patch b/SOURCES/0001-epiphany-Don-t-adopt-apps-that-have-package-name-set.patch new file mode 100644 index 0000000..cc12a51 --- /dev/null +++ b/SOURCES/0001-epiphany-Don-t-adopt-apps-that-have-package-name-set.patch @@ -0,0 +1,35 @@ +From d51c480fc9f1bcb1b878be156f88741a6bbb364d Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Tue, 24 Sep 2019 11:16:14 +0200 +Subject: [PATCH 1/2] epiphany: Don't adopt apps that have package name set + +In Fedora appstream metadata we have apps that +are supposed to be installed as packages and have the pkgname set. + +Instead of adopting them in the epiphany plugin, leave them for the +packagekit plugin to handle. + +https://gitlab.gnome.org/GNOME/gnome-software/issues/802 +--- + plugins/epiphany/gs-plugin-epiphany.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/plugins/epiphany/gs-plugin-epiphany.c b/plugins/epiphany/gs-plugin-epiphany.c +index 44e2e5bd..3db666e8 100644 +--- a/plugins/epiphany/gs-plugin-epiphany.c ++++ b/plugins/epiphany/gs-plugin-epiphany.c +@@ -56,8 +56,10 @@ gs_plugin_initialize (GsPlugin *plugin) + void + gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app) + { +- if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP) ++ if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP && ++ gs_app_get_bundle_kind (app) != AS_BUNDLE_KIND_PACKAGE) { + gs_app_set_management_plugin (app, gs_plugin_get_name (plugin)); ++ } + } + + static gchar * +-- +2.24.1 + diff --git a/SOURCES/0002-packagekit-Don-t-skip-over-web-apps.patch b/SOURCES/0002-packagekit-Don-t-skip-over-web-apps.patch new file mode 100644 index 0000000..c3090b9 --- /dev/null +++ b/SOURCES/0002-packagekit-Don-t-skip-over-web-apps.patch @@ -0,0 +1,39 @@ +From d3b4d3bd00b3d664ed5873babf06baf42f624de3 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Tue, 24 Sep 2019 11:19:31 +0200 +Subject: [PATCH 2/2] packagekit: Don't skip over web apps + +We now have web apps that are supposed to be installed as packages. +Don't just skip over all web apps, but rely on the management plugin +being correctly set. + +Fixes: https://gitlab.gnome.org/GNOME/gnome-software/issues/802 +--- + plugins/packagekit/gs-plugin-packagekit-refine.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/plugins/packagekit/gs-plugin-packagekit-refine.c b/plugins/packagekit/gs-plugin-packagekit-refine.c +index 924b74a4..84849dc4 100644 +--- a/plugins/packagekit/gs-plugin-packagekit-refine.c ++++ b/plugins/packagekit/gs-plugin-packagekit-refine.c +@@ -487,8 +487,6 @@ gs_plugin_packagekit_refine_details (GsPlugin *plugin, + GsApp *app = gs_app_list_index (list, i); + if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) + continue; +- if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP) +- continue; + if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0) + continue; + if (gs_app_get_source_id_default (app) == NULL) +@@ -635,8 +633,6 @@ gs_plugin_packagekit_refine_name_to_id (GsPlugin *plugin, + const gchar *tmp; + if (gs_app_has_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX)) + continue; +- if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP) +- continue; + tmp = gs_app_get_management_plugin (app); + if (tmp != NULL && g_strcmp0 (tmp, "packagekit") != 0) + continue; +-- +2.24.1 + diff --git a/SPECS/gnome-software.spec b/SPECS/gnome-software.spec index 50607d2..f67ed02 100644 --- a/SPECS/gnome-software.spec +++ b/SPECS/gnome-software.spec @@ -13,7 +13,7 @@ Name: gnome-software Version: 3.30.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -26,6 +26,8 @@ Patch1: 0001-Lower-AsStore-new-API-version-checks-for-Fedora.patch # Backported from upstream Patch2: 0001-details-page-Hide-addons-that-are-not-available-in-r.patch +Patch3: 0001-epiphany-Don-t-adopt-apps-that-have-package-name-set.patch +Patch4: 0002-packagekit-Don-t-skip-over-web-apps.patch BuildRequires: gcc BuildRequires: gettext @@ -247,6 +249,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_mandir}/man1/gnome-software-editor.1* %changelog +* Wed Jan 29 2020 Kalev Lember - 3.30.6-3 +- Fix issues with installing Cockpit +- Resolves: #1759913 + * Fri Jul 12 2019 Kalev Lember - 3.30.6-2 - Hide addons that are not available in repos - Resolves: #1719779