From 8310adfd6060fc1f2b0fcd1a0a1eccd2dd174623 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 Oct 2017 12:20:09 +0200 Subject: [PATCH 01/24] Backport a flatpakref installation fix --- ...correct-origin-when-installing-a-fla.patch | 44 +++++++++++++++++++ gnome-software.spec | 8 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch diff --git a/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch b/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch new file mode 100644 index 0000000..36b771b --- /dev/null +++ b/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch @@ -0,0 +1,44 @@ +From 1a4c98b4ffa089985806a76a73d741465f3cff83 Mon Sep 17 00:00:00 2001 +From: Joaquim Rocha +Date: Sat, 1 Jul 2017 01:33:00 +0200 +Subject: [PATCH] flatpak: Set the correct origin when installing a flatpakref + +When installing a flatpakref, part of the process is to install its +ref file, and the code was assuming that this installation always +results in a new remote (named as app_name-origin). However, if there +is already a remote with the same URI as the one coming from the ref +file, it will not add the new one in order to avoid redudancy. + +Since the GsApp representing the one in the flatpakref was being +assigned the "app_name-origin" as its origin, it would fail to install +later because this expected origin may not exist (as explained above). + +To fix this, once the ref file is installed, we get the resulting +remote's name (i.e. a new one or the existing one) and override the +app's origin with it, which will allow the installation to succeed. +--- + plugins/flatpak/gs-flatpak.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c +index af6834fb..a33aa060 100644 +--- a/plugins/flatpak/gs-flatpak.c ++++ b/plugins/flatpak/gs-flatpak.c +@@ -2779,6 +2779,14 @@ gs_flatpak_app_install (GsFlatpak *self, + return FALSE; + } + ++ /* the installation of the ref file above will not create a new remote for ++ * the app if its URL is already configured as another remote, thus we ++ * need to update the app origin to match that or it may end up with ++ * an nonexistent origin; and we first need to set the origin to NULL to ++ * circumvent the safety check... */ ++ gs_app_set_origin (app, NULL); ++ gs_app_set_origin (app, flatpak_remote_ref_get_remote_name (xref2)); ++ + /* update search tokens for new remote */ + if (!gs_flatpak_refresh_appstream (self, G_MAXUINT, 0, cancellable, error)) { + gs_app_set_state_recover (app); +-- +2.14.1 + diff --git a/gnome-software.spec b/gnome-software.spec index f625a13..aa280de 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,13 +14,16 @@ Name: gnome-software Version: 3.26.1 -Release: 1%{?dist} +Release: 2%{?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.26/%{name}-%{version}.tar.xz +# Backported from upstream +Patch0: 0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch + BuildRequires: gettext BuildRequires: libxslt BuildRequires: docbook-style-xsl @@ -239,6 +242,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Tue Oct 10 2017 Kalev Lember - 3.26.1-2 +- Backport a flatpakref installation fix + * Sun Oct 08 2017 Kalev Lember - 3.26.1-1 - Update to 3.26.1 From 39a513010095c1dfedef03a401d504cd0d9740a1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 25 Oct 2017 14:24:10 +0200 Subject: [PATCH 02/24] Fix "too many results returned" error after distro upgrades It turns out we had an error path that caused gnome-software to error out when the offline update results file listed more than 500 packages, which is an easy limit to cross for distro upgrades. This backports an upstream patch that fixes this. https://bugzilla.redhat.com/show_bug.cgi?id=1496489 --- ...Don-t-error-out-for-over-500-results.patch | 41 +++++++++++++++++++ gnome-software.spec | 6 ++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-Don-t-error-out-for-over-500-results.patch diff --git a/0001-Don-t-error-out-for-over-500-results.patch b/0001-Don-t-error-out-for-over-500-results.patch new file mode 100644 index 0000000..d6e5a4a --- /dev/null +++ b/0001-Don-t-error-out-for-over-500-results.patch @@ -0,0 +1,41 @@ +From 993faac2759316fde53a61109fc62fd271f315c2 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Wed, 25 Oct 2017 12:43:02 +0200 +Subject: [PATCH] Don't error out for over 500 results + +We can legitimately get more than 500 when updating a large number of packages +and then showing the offline update results. + +This commit drops the failure path for >500 results; for cases where +performance is critical (search), the results are already truncated in +gs_plugin_loader_job_sorted_truncation_again() and for other cases we +can just keep on going. + +https://bugzilla.redhat.com/show_bug.cgi?id=1496489 +--- + lib/gs-plugin-loader.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c +index bf36d627..ff12113b 100644 +--- a/lib/gs-plugin-loader.c ++++ b/lib/gs-plugin-loader.c +@@ -3290,15 +3290,6 @@ gs_plugin_loader_process_thread_cb (GTask *task, + } + } + +- /* too many */ +- if (gs_app_list_length (list) > 500) { +- g_task_return_new_error (task, +- GS_PLUGIN_ERROR, +- GS_PLUGIN_ERROR_NOT_SUPPORTED, +- "too many results returned"); +- return; +- } +- + /* filter duplicates with priority, taking into account the source name + * & version, so we combine available updates with the installed app */ + gs_app_list_filter (list, gs_plugin_loader_app_set_prio, plugin_loader); +-- +2.14.2 + diff --git a/gnome-software.spec b/gnome-software.spec index aa280de..5af518e 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,7 +14,7 @@ Name: gnome-software Version: 3.26.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -23,6 +23,7 @@ Source0: https://download.gnome.org/sources/gnome-software/3.26/%{name}-%{vers # Backported from upstream Patch0: 0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch +Patch1: 0001-Don-t-error-out-for-over-500-results.patch BuildRequires: gettext BuildRequires: libxslt @@ -242,6 +243,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Wed Oct 25 2017 Kalev Lember - 3.26.1-3 +- Fix "too many results returned" error after distro upgrades (#1496489) + * Tue Oct 10 2017 Kalev Lember - 3.26.1-2 - Backport a flatpakref installation fix From 8835513012ffa1700f65285fbb7af6b1ad3830b0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 9 Nov 2017 16:33:40 +0100 Subject: [PATCH 03/24] Update to 3.26.2 --- .gitignore | 1 + ...Don-t-error-out-for-over-500-results.patch | 41 ----------------- ...correct-origin-when-installing-a-fla.patch | 44 ------------------- gnome-software.spec | 11 +++-- sources | 2 +- 5 files changed, 7 insertions(+), 92 deletions(-) delete mode 100644 0001-Don-t-error-out-for-over-500-results.patch delete mode 100644 0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch diff --git a/.gitignore b/.gitignore index 9464e10..e2e6754 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ /gnome-software-3.25.91.tar.xz /gnome-software-3.26.0.tar.xz /gnome-software-3.26.1.tar.xz +/gnome-software-3.26.2.tar.xz diff --git a/0001-Don-t-error-out-for-over-500-results.patch b/0001-Don-t-error-out-for-over-500-results.patch deleted file mode 100644 index d6e5a4a..0000000 --- a/0001-Don-t-error-out-for-over-500-results.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 993faac2759316fde53a61109fc62fd271f315c2 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Wed, 25 Oct 2017 12:43:02 +0200 -Subject: [PATCH] Don't error out for over 500 results - -We can legitimately get more than 500 when updating a large number of packages -and then showing the offline update results. - -This commit drops the failure path for >500 results; for cases where -performance is critical (search), the results are already truncated in -gs_plugin_loader_job_sorted_truncation_again() and for other cases we -can just keep on going. - -https://bugzilla.redhat.com/show_bug.cgi?id=1496489 ---- - lib/gs-plugin-loader.c | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c -index bf36d627..ff12113b 100644 ---- a/lib/gs-plugin-loader.c -+++ b/lib/gs-plugin-loader.c -@@ -3290,15 +3290,6 @@ gs_plugin_loader_process_thread_cb (GTask *task, - } - } - -- /* too many */ -- if (gs_app_list_length (list) > 500) { -- g_task_return_new_error (task, -- GS_PLUGIN_ERROR, -- GS_PLUGIN_ERROR_NOT_SUPPORTED, -- "too many results returned"); -- return; -- } -- - /* filter duplicates with priority, taking into account the source name - * & version, so we combine available updates with the installed app */ - gs_app_list_filter (list, gs_plugin_loader_app_set_prio, plugin_loader); --- -2.14.2 - diff --git a/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch b/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch deleted file mode 100644 index 36b771b..0000000 --- a/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1a4c98b4ffa089985806a76a73d741465f3cff83 Mon Sep 17 00:00:00 2001 -From: Joaquim Rocha -Date: Sat, 1 Jul 2017 01:33:00 +0200 -Subject: [PATCH] flatpak: Set the correct origin when installing a flatpakref - -When installing a flatpakref, part of the process is to install its -ref file, and the code was assuming that this installation always -results in a new remote (named as app_name-origin). However, if there -is already a remote with the same URI as the one coming from the ref -file, it will not add the new one in order to avoid redudancy. - -Since the GsApp representing the one in the flatpakref was being -assigned the "app_name-origin" as its origin, it would fail to install -later because this expected origin may not exist (as explained above). - -To fix this, once the ref file is installed, we get the resulting -remote's name (i.e. a new one or the existing one) and override the -app's origin with it, which will allow the installation to succeed. ---- - plugins/flatpak/gs-flatpak.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c -index af6834fb..a33aa060 100644 ---- a/plugins/flatpak/gs-flatpak.c -+++ b/plugins/flatpak/gs-flatpak.c -@@ -2779,6 +2779,14 @@ gs_flatpak_app_install (GsFlatpak *self, - return FALSE; - } - -+ /* the installation of the ref file above will not create a new remote for -+ * the app if its URL is already configured as another remote, thus we -+ * need to update the app origin to match that or it may end up with -+ * an nonexistent origin; and we first need to set the origin to NULL to -+ * circumvent the safety check... */ -+ gs_app_set_origin (app, NULL); -+ gs_app_set_origin (app, flatpak_remote_ref_get_remote_name (xref2)); -+ - /* update search tokens for new remote */ - if (!gs_flatpak_refresh_appstream (self, G_MAXUINT, 0, cancellable, error)) { - gs_app_set_state_recover (app); --- -2.14.1 - diff --git a/gnome-software.spec b/gnome-software.spec index 5af518e..7d8bf80 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -13,18 +13,14 @@ %bcond_without packagekit Name: gnome-software -Version: 3.26.1 -Release: 3%{?dist} +Version: 3.26.2 +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/3.26/%{name}-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch -Patch1: 0001-Don-t-error-out-for-over-500-results.patch - BuildRequires: gettext BuildRequires: libxslt BuildRequires: docbook-style-xsl @@ -243,6 +239,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Thu Nov 09 2017 Kalev Lember - 3.26.2-1 +- Update to 3.26.2 + * Wed Oct 25 2017 Kalev Lember - 3.26.1-3 - Fix "too many results returned" error after distro upgrades (#1496489) diff --git a/sources b/sources index af97085..c990439 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.26.1.tar.xz) = 4996de18a6b1b6f04d72cc4c9c71104acdf6157abf043348e2929ad526d47400976d2e3b88095fbff19a392fd5130219c519cc6c8dd2b823f2550a8fd8aa67a0 +SHA512 (gnome-software-3.26.2.tar.xz) = 18c7b7b2e5c1be4c9e89e885ea51e8486c0cc05418e3a448dc2489b42f73b40055cacd1da96e28dc7d840bd3c4db8c62a5974e725304b4bf2b722401eeb5f7bd From d83f8c6acb6549735480475c65ebbca557ff2251 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 21 Nov 2017 12:15:00 +0100 Subject: [PATCH 04/24] Update to 3.26.3 --- .gitignore | 1 + gnome-software.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e2e6754..28dfc74 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ /gnome-software-3.26.0.tar.xz /gnome-software-3.26.1.tar.xz /gnome-software-3.26.2.tar.xz +/gnome-software-3.26.3.tar.xz diff --git a/gnome-software.spec b/gnome-software.spec index 7d8bf80..93bfc01 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -13,7 +13,7 @@ %bcond_without packagekit Name: gnome-software -Version: 3.26.2 +Version: 3.26.3 Release: 1%{?dist} Summary: A software center for GNOME @@ -239,6 +239,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Tue Nov 21 2017 Kalev Lember - 3.26.3-1 +- Update to 3.26.3 + * Thu Nov 09 2017 Kalev Lember - 3.26.2-1 - Update to 3.26.2 diff --git a/sources b/sources index c990439..27a3140 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.26.2.tar.xz) = 18c7b7b2e5c1be4c9e89e885ea51e8486c0cc05418e3a448dc2489b42f73b40055cacd1da96e28dc7d840bd3c4db8c62a5974e725304b4bf2b722401eeb5f7bd +SHA512 (gnome-software-3.26.3.tar.xz) = d8ca8d1bf7e491548a7f7a18e232f277a22323d341bf568188eafe1111b878fd2b6450c2dc914057bc59f4a54470e250698e9472fa6297547472f66c13bdcfd5 From 27e8cc775f4e37c006021ba3df73fa7837a87618 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 13 Nov 2017 22:43:43 +0100 Subject: [PATCH 05/24] Explicitly disable ubuntuone support --- gnome-software.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-software.spec b/gnome-software.spec index 93bfc01..9124c0c 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -115,6 +115,7 @@ Adds support for Snap packages from the Snap store. %endif -Denable-external-appstream=false \ -Denable-tests=false \ + -Denable-ubuntuone=false \ -Denable-ubuntu-reviews=false %meson_build @@ -210,7 +211,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %if %{with packagekit} %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_systemd-updates.so %endif -%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_ubuntuone.so %{_sysconfdir}/xdg/autostart/gnome-software-service.desktop %if %{with packagekit} %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service From b20ae8b77549aeb4181d241740609b6dd9ff20e0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 17 Dec 2017 10:08:27 +0100 Subject: [PATCH 06/24] Update to 3.26.4 --- .gitignore | 1 + gnome-software.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 28dfc74..0e1c7d2 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /gnome-software-3.26.1.tar.xz /gnome-software-3.26.2.tar.xz /gnome-software-3.26.3.tar.xz +/gnome-software-3.26.4.tar.xz diff --git a/gnome-software.spec b/gnome-software.spec index 9124c0c..5e7aa48 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -13,7 +13,7 @@ %bcond_without packagekit Name: gnome-software -Version: 3.26.3 +Version: 3.26.4 Release: 1%{?dist} Summary: A software center for GNOME @@ -239,6 +239,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Sun Dec 17 2017 Kalev Lember - 3.26.4-1 +- Update to 3.26.4 + * Tue Nov 21 2017 Kalev Lember - 3.26.3-1 - Update to 3.26.3 diff --git a/sources b/sources index 27a3140..0fc1c3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.26.3.tar.xz) = d8ca8d1bf7e491548a7f7a18e232f277a22323d341bf568188eafe1111b878fd2b6450c2dc914057bc59f4a54470e250698e9472fa6297547472f66c13bdcfd5 +SHA512 (gnome-software-3.26.4.tar.xz) = ee1e45745a8250ad2cfb79cc977e5681a672f777de5b37407ff1b368a2238d7111bbaf0e43f30dc349b697f67ad8fb6399b2a05fe8c94999fb887e2abf7fa5f5 From ce55212e7118a1fcfbe9e66d15fac7f71257d1e6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 8 Jan 2018 21:52:52 +0100 Subject: [PATCH 07/24] Update to 3.26.5 --- .gitignore | 1 + gnome-software.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0e1c7d2..97c1d01 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /gnome-software-3.26.2.tar.xz /gnome-software-3.26.3.tar.xz /gnome-software-3.26.4.tar.xz +/gnome-software-3.26.5.tar.xz diff --git a/gnome-software.spec b/gnome-software.spec index 5e7aa48..7557686 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -13,7 +13,7 @@ %bcond_without packagekit Name: gnome-software -Version: 3.26.4 +Version: 3.26.5 Release: 1%{?dist} Summary: A software center for GNOME @@ -239,6 +239,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Mon Jan 08 2018 Kalev Lember - 3.26.5-1 +- Update to 3.26.5 + * Sun Dec 17 2017 Kalev Lember - 3.26.4-1 - Update to 3.26.4 diff --git a/sources b/sources index 0fc1c3f..ba7441e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.26.4.tar.xz) = ee1e45745a8250ad2cfb79cc977e5681a672f777de5b37407ff1b368a2238d7111bbaf0e43f30dc349b697f67ad8fb6399b2a05fe8c94999fb887e2abf7fa5f5 +SHA512 (gnome-software-3.26.5.tar.xz) = ab93eafef89e24c577553ca6fffd2426b3e954e01e49deaeae1145bcbeca7e5bb4beb02b75efd83b52c963c5eedebc91ed372fd83dee160ed7cc7ac53e166c72 From 3ab284ac8bcf504df1eca73c8712171fee62e2fa Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 8 Jan 2018 21:50:13 +0100 Subject: [PATCH 08/24] Drop unused --without packagekit option We do packagekit/rpm-ostree detection at runtime, not at compile time. --- gnome-software.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/gnome-software.spec b/gnome-software.spec index 7557686..0cf2c7a 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -9,9 +9,6 @@ %global fwupd_version 0.9.7 %global flatpak_version 0.9.4 -# this should be set using "--without packagekit" when atomic -%bcond_without packagekit - Name: gnome-software Version: 3.26.5 Release: 1%{?dist} @@ -36,9 +33,7 @@ BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: libappstream-glib-devel >= %{appstream_glib_version} BuildRequires: libsoup-devel BuildRequires: meson -%if %{with packagekit} BuildRequires: PackageKit-glib-devel >= %{packagekit_version} -%endif BuildRequires: polkit-devel BuildRequires: libsecret-devel BuildRequires: flatpak-devel >= %{flatpak_version} @@ -108,11 +103,7 @@ Adds support for Snap packages from the Snap store. %meson \ -Denable-snap=true \ -Denable-gudev=true \ -%if %{with packagekit} -Denable-packagekit=true \ -%else - -Denable-packagekit=false \ -%endif -Denable-external-appstream=false \ -Denable-tests=false \ -Denable-ubuntuone=false \ @@ -191,7 +182,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_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_ostree.so -%if %{with packagekit} %{_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 @@ -200,7 +190,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_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.so -%endif %{_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 @@ -208,13 +197,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rpm.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_shell-extensions.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_steam.so -%if %{with packagekit} %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_systemd-updates.so -%endif %{_sysconfdir}/xdg/autostart/gnome-software-service.desktop -%if %{with packagekit} %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service -%endif %{_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 @@ -241,6 +226,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog * Mon Jan 08 2018 Kalev Lember - 3.26.5-1 - Update to 3.26.5 +- Drop unused --without packagekit option * Sun Dec 17 2017 Kalev Lember - 3.26.4-1 - Update to 3.26.4 From 81ba583271c3398879a6a6fd8ac3aa37bdf99754 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 8 Feb 2018 13:59:40 +0100 Subject: [PATCH 09/24] Update to 3.26.6 --- .gitignore | 1 + gnome-software.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 97c1d01..5c16f7d 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ /gnome-software-3.26.3.tar.xz /gnome-software-3.26.4.tar.xz /gnome-software-3.26.5.tar.xz +/gnome-software-3.26.6.tar.xz diff --git a/gnome-software.spec b/gnome-software.spec index 0cf2c7a..81ed523 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -10,7 +10,7 @@ %global flatpak_version 0.9.4 Name: gnome-software -Version: 3.26.5 +Version: 3.26.6 Release: 1%{?dist} Summary: A software center for GNOME @@ -224,6 +224,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Thu Feb 08 2018 Kalev Lember - 3.26.6-1 +- Update to 3.26.6 + * Mon Jan 08 2018 Kalev Lember - 3.26.5-1 - Update to 3.26.5 - Drop unused --without packagekit option diff --git a/sources b/sources index ba7441e..4283f62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.26.5.tar.xz) = ab93eafef89e24c577553ca6fffd2426b3e954e01e49deaeae1145bcbeca7e5bb4beb02b75efd83b52c963c5eedebc91ed372fd83dee160ed7cc7ac53e166c72 +SHA512 (gnome-software-3.26.6.tar.xz) = c9e7bf04a8efb6c563698e3f36d56f19c8cdf70b6c657776e6d46ffbe04b20da5470dcd5e07c7c8fe5592f173266cfa1017ce0d8418966780be166ed0e94dfd2 From 6f67a26d3d54c78afa7ed9467b1b69cb0900db31 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 8 Feb 2018 14:10:36 +0100 Subject: [PATCH 10/24] Add fedora-workstation-repositories to nonfree-sources schema defaults This sets up gnome-software to offer installing the fedora-workstation-repositories package in the Software Sources dialog, as per the guidance given by Fedora Council: https://pagure.io/Fedora-Council/tickets/issue/121 --- gnome-software.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnome-software.spec b/gnome-software.spec index 81ed523..6254cfc 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -121,6 +121,7 @@ desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.deskto cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override << FOE [org.gnome.software] official-sources = [ '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' ] +nonfree-sources = [ 'fedora-workstation-repositories' ] FOE %find_lang %name --with-gnome @@ -226,6 +227,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog * Thu Feb 08 2018 Kalev Lember - 3.26.6-1 - Update to 3.26.6 +- Add fedora-workstation-repositories to nonfree-sources schema defaults * Mon Jan 08 2018 Kalev Lember - 3.26.5-1 - Update to 3.26.5 From 3855d3bfa594b5166c1b05a66bab188fa0e93747 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 2 Mar 2018 14:08:07 +0100 Subject: [PATCH 11/24] Update to 3.26.7 --- .gitignore | 1 + gnome-software.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5c16f7d..e9eb374 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /gnome-software-3.26.4.tar.xz /gnome-software-3.26.5.tar.xz /gnome-software-3.26.6.tar.xz +/gnome-software-3.26.7.tar.xz diff --git a/gnome-software.spec b/gnome-software.spec index 6254cfc..ef54437 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -10,7 +10,7 @@ %global flatpak_version 0.9.4 Name: gnome-software -Version: 3.26.6 +Version: 3.26.7 Release: 1%{?dist} Summary: A software center for GNOME @@ -169,7 +169,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-pkgdb-collections.so -%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-tagger-usage.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fwupd.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_generic-updates.so @@ -225,6 +224,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Fri Mar 02 2018 Kalev Lember - 3.26.7-1 +- Update to 3.26.7 + * Thu Feb 08 2018 Kalev Lember - 3.26.6-1 - Update to 3.26.6 - Add fedora-workstation-repositories to nonfree-sources schema defaults diff --git a/sources b/sources index 4283f62..1141f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.26.6.tar.xz) = c9e7bf04a8efb6c563698e3f36d56f19c8cdf70b6c657776e6d46ffbe04b20da5470dcd5e07c7c8fe5592f173266cfa1017ce0d8418966780be166ed0e94dfd2 +SHA512 (gnome-software-3.26.7.tar.xz) = 0c312c665b6e17ec958717c8bc62d249bc660233e0eeceedee736d964766583be0336ea492688041b76fab5f700ab3393cc1ab2a5b1d6783a8d8541e939793d2 From 2899a37895f84187208750c9219d79676a8343d4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 2 Mar 2018 14:22:25 +0100 Subject: [PATCH 12/24] Ship a background image for F28 beta upgrades --- .gitignore | 1 + gnome-software.spec | 8 ++++++++ sources | 1 + 3 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index e9eb374..bb53a69 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ /gnome-software-3.26.5.tar.xz /gnome-software-3.26.6.tar.xz /gnome-software-3.26.7.tar.xz +/f28.png diff --git a/gnome-software.spec b/gnome-software.spec index ef54437..36b4675 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -17,6 +17,8 @@ Summary: A software center for GNOME License: GPLv2+ URL: https://wiki.gnome.org/Apps/Software Source0: https://download.gnome.org/sources/gnome-software/3.26/%{name}-%{version}.tar.xz +# /usr/share/backgrounds/f28/default/standard/f28.png from f28-backgrounds-base +Source1: f28.png BuildRequires: gettext BuildRequires: libxslt @@ -124,6 +126,10 @@ official-sources = [ 'fedora', 'fedora-debuginfo', 'fedora-source', 'koji-overri nonfree-sources = [ 'fedora-workstation-repositories' ] FOE +# Install upgrade background image +mkdir -p %{buildroot}%{_datadir}/gnome-software/backgrounds +cp -a %{SOURCE1} %{buildroot}%{_datadir}/gnome-software/backgrounds/ + %find_lang %name --with-gnome %check @@ -153,6 +159,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-software/*.png %{_mandir}/man1/gnome-software.1.gz %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/gnome-software/backgrounds/ %{_datadir}/gnome-software/featured-*.svg %{_datadir}/gnome-software/featured-*.jpg %{_datadir}/metainfo/org.gnome.Software.appdata.xml @@ -226,6 +233,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog * Fri Mar 02 2018 Kalev Lember - 3.26.7-1 - Update to 3.26.7 +- Ship a background image for F28 beta upgrades * Thu Feb 08 2018 Kalev Lember - 3.26.6-1 - Update to 3.26.6 diff --git a/sources b/sources index 1141f2c..9c549fb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (gnome-software-3.26.7.tar.xz) = 0c312c665b6e17ec958717c8bc62d249bc660233e0eeceedee736d964766583be0336ea492688041b76fab5f700ab3393cc1ab2a5b1d6783a8d8541e939793d2 +SHA512 (f28.png) = cf3a1fa3c042451f6ef9006b29d750ed147a4d4f2f0ad4cdbb4e76089b93f4c319997c4454d068ba94ace3b39444a93816c2a88cd8d1601a0c4d037e30ca5f71 From 16c4e7a7c92813f7cc49437738bb4036587fc44b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 6 Mar 2018 10:59:46 +0100 Subject: [PATCH 13/24] Update to 3.28.0 --- .gitignore | 1 + gnome-software.spec | 36 +++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index bb53a69..34f3328 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /gnome-software-3.26.6.tar.xz /gnome-software-3.26.7.tar.xz /f28.png +/gnome-software-3.28.0.tar.xz diff --git a/gnome-software.spec b/gnome-software.spec index 36b4675..8cd9d15 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -1,22 +1,22 @@ %global glib2_version 2.46.0 %global gtk3_version 3.22.4 -%global json_glib_version 1.1.1 +%global json_glib_version 1.2.0 %global packagekit_version 1.1.1 -%global appstream_glib_version 0.7.1 -%global libsoup_version 2.51.92 -%global gsettings_desktop_schemas_version 3.11.5 -%global gnome_desktop_version 3.17.92 -%global fwupd_version 0.9.7 +%global appstream_glib_version 0.7.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.3 %global flatpak_version 0.9.4 Name: gnome-software -Version: 3.26.7 +Version: 3.28.0 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/3.26/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-software/3.28/%{name}-%{version}.tar.xz # /usr/share/backgrounds/f28/default/standard/f28.png from f28-backgrounds-base Source1: f28.png @@ -28,9 +28,9 @@ BuildRequires: fwupd-devel >= %{fwupd_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-desktop3-devel BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version} +BuildRequires: gspell-devel BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtk-doc -BuildRequires: gtkspell3-devel BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: libappstream-glib-devel >= %{appstream_glib_version} BuildRequires: libsoup-devel @@ -40,13 +40,16 @@ BuildRequires: polkit-devel BuildRequires: libsecret-devel BuildRequires: flatpak-devel >= %{flatpak_version} BuildRequires: ostree-devel -BuildRequires: rpm-devel BuildRequires: libgudev1-devel BuildRequires: valgrind-devel BuildRequires: liboauth-devel BuildRequires: snapd-glib-devel +%if 0%{?fedora} == 27 +Requires: appstream-data >= 27-9 +%else Requires: appstream-data +%endif %if 0%{?fedora} Requires: epiphany-runtime %endif @@ -107,6 +110,7 @@ Adds support for Snap packages from the Snap store. -Denable-gudev=true \ -Denable-packagekit=true \ -Denable-external-appstream=false \ + -Denable-rpm-ostree=false \ -Denable-tests=false \ -Denable-ubuntuone=false \ -Denable-ubuntu-reviews=false @@ -122,8 +126,7 @@ desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.deskto # set up for Fedora cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override << FOE [org.gnome.software] -official-sources = [ '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' ] -nonfree-sources = [ 'fedora-workstation-repositories' ] +official-repos = [ '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' ] FOE # Install upgrade background image @@ -150,7 +153,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files -f %{name}.lang -%doc AUTHORS README +%doc AUTHORS README.md %license COPYING %{_bindir}/gnome-software %{_datadir}/applications/gnome-software-local-file.desktop @@ -188,20 +191,20 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_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_ostree.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_rpm.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_shell-extensions.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_steam.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_systemd-updates.so @@ -231,6 +234,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Mon Mar 12 2018 Kalev Lember - 3.28.0-1 +- Update to 3.28.0 + * Fri Mar 02 2018 Kalev Lember - 3.26.7-1 - Update to 3.26.7 - Ship a background image for F28 beta upgrades diff --git a/sources b/sources index 9c549fb..618b987 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gnome-software-3.26.7.tar.xz) = 0c312c665b6e17ec958717c8bc62d249bc660233e0eeceedee736d964766583be0336ea492688041b76fab5f700ab3393cc1ab2a5b1d6783a8d8541e939793d2 +SHA512 (gnome-software-3.28.0.tar.xz) = 44df87554e996f2a4019ffd88daafba873554ab766a1e075b22ba8ebd6aa758f768449dfa2cce6a1f3700ec732bd2c9a710d428b5e563a456190a3b802411298 SHA512 (f28.png) = cf3a1fa3c042451f6ef9006b29d750ed147a4d4f2f0ad4cdbb4e76089b93f4c319997c4454d068ba94ace3b39444a93816c2a88cd8d1601a0c4d037e30ca5f71 From e4250e1ac59dbba67f9017f21a93fe8c1db6f198 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 4 Mar 2018 21:37:50 -0500 Subject: [PATCH 14/24] Drop obsolete snapd-login-service requirement for snap plugin subpackage --- gnome-software.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gnome-software.spec b/gnome-software.spec index 8cd9d15..969ac70 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -95,7 +95,6 @@ Editor for designing banners for GNOME Software. %package snap Summary: Support for Ubuntu Snap packages Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: snapd-login-service Supplements: (gnome-software%{?_isa} and snapd%{?_isa}) %description snap From e140f3b9037f6f769e827593ec8c37749198081c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 7 Mar 2018 17:53:44 +0100 Subject: [PATCH 15/24] Move org.gnome.Software.Featured.xml from -editor to main package These are needed for featured apps to show up. Otherwise we just fall back to showing GNOME Builder and nothing else. --- gnome-software.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnome-software.spec b/gnome-software.spec index 969ac70..085529b 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -208,6 +208,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_steam.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 @@ -228,13 +229,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files editor %{_bindir}/gnome-software-editor -%{_datadir}/app-info/xmls/org.gnome.Software.Featured.xml %{_datadir}/applications/org.gnome.Software.Editor.desktop %{_mandir}/man1/gnome-software-editor.1* %changelog * Mon Mar 12 2018 Kalev Lember - 3.28.0-1 - Update to 3.28.0 +- Move org.gnome.Software.Featured.xml from -editor to main package * Fri Mar 02 2018 Kalev Lember - 3.26.7-1 - Update to 3.26.7 From 912f073597d1e48a19f54f11a247849fb481657a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 13 Mar 2018 15:24:53 +0100 Subject: [PATCH 16/24] Backport an upstream patch to fix shell extensions app ID --- ...ivial-Use-new-libappstream-glib-to-b.patch | 52 +++++++++++++++++++ gnome-software.spec | 8 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch diff --git a/0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch b/0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch new file mode 100644 index 0000000..53474ed --- /dev/null +++ b/0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch @@ -0,0 +1,52 @@ +From 2a0f56590f4c86550c8603e1de5a97e57426ff2a Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Tue, 13 Mar 2018 13:08:39 +0100 +Subject: [PATCH] Revert "Revert "trivial: Use new libappstream-glib to build + the ID"" + +We've now fixed the appstream generator to match the generated ID in +https://github.com/hughsie/appstream-glib/commit/1f7ff84a04c227bccb60c76f461f3dccbe372f7a + +This reverts commit c9dbd646c3f7d23699685f320baefcb12198298f. +--- + plugins/shell-extensions/gs-plugin-shell-extensions.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/plugins/shell-extensions/gs-plugin-shell-extensions.c b/plugins/shell-extensions/gs-plugin-shell-extensions.c +index 8edee560b904..f55eb2fbc5e8 100644 +--- a/plugins/shell-extensions/gs-plugin-shell-extensions.c ++++ b/plugins/shell-extensions/gs-plugin-shell-extensions.c +@@ -105,12 +105,6 @@ gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app) + } + } + +-static gchar * +-gs_plugin_shell_extensions_id_from_uuid (const gchar *uuid) +-{ +- return g_strdup_printf ("%s.shell-extension", uuid); +-} +- + static AsAppState + gs_plugin_shell_extensions_convert_state (guint value) + { +@@ -143,7 +137,7 @@ gs_plugin_shell_extensions_parse_installed (GsPlugin *plugin, + g_autoptr(AsIcon) ic = NULL; + g_autoptr(GsApp) app = NULL; + +- id = gs_plugin_shell_extensions_id_from_uuid (uuid); ++ id = as_utils_appstream_id_build (uuid); + app = gs_app_new (id); + gs_app_set_metadata (app, "GnomeSoftware::Creator", + gs_plugin_get_name (plugin)); +@@ -540,7 +534,7 @@ gs_plugin_shell_extensions_parse_app (GsPlugin *plugin, + tmp = json_object_get_string_member (json_app, "uuid"); + if (tmp != NULL) { + g_autofree gchar *id = NULL; +- id = gs_plugin_shell_extensions_id_from_uuid (tmp); ++ id = as_utils_appstream_id_build (tmp); + as_app_set_id (app, id); + as_app_add_metadata (app, "shell-extensions::uuid", tmp); + } +-- +2.16.2 + diff --git a/gnome-software.spec b/gnome-software.spec index 085529b..5b6c002 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -11,7 +11,7 @@ Name: gnome-software Version: 3.28.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -20,6 +20,9 @@ Source0: https://download.gnome.org/sources/gnome-software/3.28/%{name}-%{vers # /usr/share/backgrounds/f28/default/standard/f28.png from f28-backgrounds-base Source1: f28.png +# Backported from upstream +Patch0: 0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch + BuildRequires: gettext BuildRequires: libxslt BuildRequires: docbook-style-xsl @@ -233,6 +236,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Tue Mar 13 2018 Kalev Lember - 3.28.0-2 +- Backport an upstream patch to fix shell extensions app ID + * Mon Mar 12 2018 Kalev Lember - 3.28.0-1 - Update to 3.28.0 - Move org.gnome.Software.Featured.xml from -editor to main package From f1c225fb8a25ed735c11a267c16860850f3de5f6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 14 Mar 2018 11:02:38 +0100 Subject: [PATCH 17/24] Fix crash on initial run with no network https://bugzilla.redhat.com/show_bug.cgi?id=1554986 --- ...loader-Don-t-abort-for-refine-errors.patch | 30 +++++++++++++++++++ gnome-software.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-plugin-loader-Don-t-abort-for-refine-errors.patch diff --git a/0001-plugin-loader-Don-t-abort-for-refine-errors.patch b/0001-plugin-loader-Don-t-abort-for-refine-errors.patch new file mode 100644 index 0000000..aac41b1 --- /dev/null +++ b/0001-plugin-loader-Don-t-abort-for-refine-errors.patch @@ -0,0 +1,30 @@ +From 5b24280921bee7fd7ad045641fe7afecf39d8130 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Tue, 13 Mar 2018 22:22:27 +0100 +Subject: [PATCH] plugin loader: Don't abort() for refine errors + +When refining a wildcard app fails, don't abort(), but instead warn and +return NULL. Refining can fail legitimately, e.g. when there's no +network access to refine a system app with pkgdb data. + +https://bugzilla.redhat.com/show_bug.cgi?id=1554986 +--- + lib/gs-plugin-loader.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c +index 55d8dde837a5..6e956b82acad 100644 +--- a/lib/gs-plugin-loader.c ++++ b/lib/gs-plugin-loader.c +@@ -3749,7 +3749,7 @@ gs_plugin_loader_app_create (GsPluginLoader *plugin_loader, const gchar *unique_ + plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, NULL); + helper = gs_plugin_loader_helper_new (plugin_loader, plugin_job); + if (!gs_plugin_loader_run_refine (helper, list, NULL, &error)) { +- g_error ("%s", error->message); ++ g_warning ("%s", error->message); + return NULL; + } + +-- +2.16.2 + diff --git a/gnome-software.spec b/gnome-software.spec index 5b6c002..df96633 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -11,7 +11,7 @@ Name: gnome-software Version: 3.28.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -22,6 +22,7 @@ Source1: f28.png # Backported from upstream Patch0: 0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch +Patch1: 0001-plugin-loader-Don-t-abort-for-refine-errors.patch BuildRequires: gettext BuildRequires: libxslt @@ -236,6 +237,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Wed Mar 14 2018 Kalev Lember - 3.28.0-3 +- Fix crash on initial run with no network (#1554986) + * Tue Mar 13 2018 Kalev Lember - 3.28.0-2 - Backport an upstream patch to fix shell extensions app ID From 84e4965cfde6be41e41bd3e2c7157e9b37e7907e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 15 Mar 2018 12:02:28 +0100 Subject: [PATCH 18/24] Fix opening results from gnome-shell search provider --- ...compare-appstream-origin-to-package-.patch | 63 +++++++++++++++++++ gnome-software.spec | 8 ++- 2 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 0001-appstream-Don-t-compare-appstream-origin-to-package-.patch diff --git a/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch b/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch new file mode 100644 index 0000000..c8d0667 --- /dev/null +++ b/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch @@ -0,0 +1,63 @@ +From 047a077a0ac308fabe002ad3099b8e1f2f24eccd Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 15 Mar 2018 11:23:52 +0100 +Subject: [PATCH] appstream: Don't compare appstream origin to package origin + +Use new as_utils_unique_id_match() from appstream-glib 0.7.8 to ignore +origin when matching AsApp to GsApp. In Fedora, we have all of system +appstream coming from system-installed appstream-data package that has +origin "fedora", but actual packages come from e.g. "updates-testing" +which doesn't match up. +--- + plugins/core/gs-plugin-appstream.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c +index 9ca091112231..3cd95c586eae 100644 +--- a/plugins/core/gs-plugin-appstream.c ++++ b/plugins/core/gs-plugin-appstream.c +@@ -527,11 +527,28 @@ gs_plugin_refine_wildcard (GsPlugin *plugin, + g_autoptr(GsApp) new = NULL; + + /* is compatible */ ++#if AS_CHECK_VERSION(0,7,8) ++ if (!as_utils_unique_id_match (gs_app_get_unique_id (app), ++ as_app_get_unique_id (item), ++ AS_UNIQUE_ID_MATCH_FLAG_SCOPE | ++ AS_UNIQUE_ID_MATCH_FLAG_BUNDLE_KIND | ++ /* don't match origin as AsApp appstream ++ * origin can differ from package origin */ ++ AS_UNIQUE_ID_MATCH_FLAG_KIND | ++ AS_UNIQUE_ID_MATCH_FLAG_ID | ++ AS_UNIQUE_ID_MATCH_FLAG_BRANCH)) { ++ g_debug ("does not match unique ID constraints: %s, %s", ++ gs_app_get_unique_id (app), ++ as_app_get_unique_id (item)); ++ continue; ++ } ++#else + if (!as_utils_unique_id_equal (gs_app_get_unique_id (app), + as_app_get_unique_id (item))) { + g_debug ("does not match unique ID constraints"); + continue; + } ++#endif + + /* does the app have an installation method */ + if (as_app_get_pkgname_default (item) == NULL && +-- +2.16.2 + +diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c +index 3cd95c586eae..8e558824caca 100644 +--- a/plugins/core/gs-plugin-appstream.c ++++ b/plugins/core/gs-plugin-appstream.c +@@ -527,7 +527,7 @@ gs_plugin_refine_wildcard (GsPlugin *plugin, + g_autoptr(GsApp) new = NULL; + + /* is compatible */ +-#if AS_CHECK_VERSION(0,7,8) ++#if AS_CHECK_VERSION(0,7,7) + if (!as_utils_unique_id_match (gs_app_get_unique_id (app), + as_app_get_unique_id (item), + AS_UNIQUE_ID_MATCH_FLAG_SCOPE | diff --git a/gnome-software.spec b/gnome-software.spec index df96633..da788b4 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -2,7 +2,7 @@ %global gtk3_version 3.22.4 %global json_glib_version 1.2.0 %global packagekit_version 1.1.1 -%global appstream_glib_version 0.7.3 +%global appstream_glib_version 0.7.7-2 %global libsoup_version 2.52.0 %global gsettings_desktop_schemas_version 3.12.0 %global gnome_desktop_version 3.18.0 @@ -11,7 +11,7 @@ Name: gnome-software Version: 3.28.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -23,6 +23,7 @@ Source1: f28.png # Backported from upstream Patch0: 0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch Patch1: 0001-plugin-loader-Don-t-abort-for-refine-errors.patch +Patch2: 0001-appstream-Don-t-compare-appstream-origin-to-package-.patch BuildRequires: gettext BuildRequires: libxslt @@ -237,6 +238,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Thu Mar 15 2018 Kalev Lember - 3.28.0-4 +- Fix opening results from gnome-shell search provider + * Wed Mar 14 2018 Kalev Lember - 3.28.0-3 - Fix crash on initial run with no network (#1554986) From 2491fb7e1bce991690ed6dfb7d75b09a424ff3d7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 Apr 2018 00:13:13 +0200 Subject: [PATCH 19/24] Update to 3.28.1 --- .gitignore | 1 + ...ivial-Use-new-libappstream-glib-to-b.patch | 52 ------------------- ...compare-appstream-origin-to-package-.patch | 50 ------------------ ...loader-Don-t-abort-for-refine-errors.patch | 30 ----------- gnome-software.spec | 11 ++-- sources | 2 +- 6 files changed, 8 insertions(+), 138 deletions(-) delete mode 100644 0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch delete mode 100644 0001-plugin-loader-Don-t-abort-for-refine-errors.patch diff --git a/.gitignore b/.gitignore index 34f3328..cb53297 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /gnome-software-3.26.7.tar.xz /f28.png /gnome-software-3.28.0.tar.xz +/gnome-software-3.28.1.tar.xz diff --git a/0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch b/0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch deleted file mode 100644 index 53474ed..0000000 --- a/0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2a0f56590f4c86550c8603e1de5a97e57426ff2a Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Tue, 13 Mar 2018 13:08:39 +0100 -Subject: [PATCH] Revert "Revert "trivial: Use new libappstream-glib to build - the ID"" - -We've now fixed the appstream generator to match the generated ID in -https://github.com/hughsie/appstream-glib/commit/1f7ff84a04c227bccb60c76f461f3dccbe372f7a - -This reverts commit c9dbd646c3f7d23699685f320baefcb12198298f. ---- - plugins/shell-extensions/gs-plugin-shell-extensions.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/plugins/shell-extensions/gs-plugin-shell-extensions.c b/plugins/shell-extensions/gs-plugin-shell-extensions.c -index 8edee560b904..f55eb2fbc5e8 100644 ---- a/plugins/shell-extensions/gs-plugin-shell-extensions.c -+++ b/plugins/shell-extensions/gs-plugin-shell-extensions.c -@@ -105,12 +105,6 @@ gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app) - } - } - --static gchar * --gs_plugin_shell_extensions_id_from_uuid (const gchar *uuid) --{ -- return g_strdup_printf ("%s.shell-extension", uuid); --} -- - static AsAppState - gs_plugin_shell_extensions_convert_state (guint value) - { -@@ -143,7 +137,7 @@ gs_plugin_shell_extensions_parse_installed (GsPlugin *plugin, - g_autoptr(AsIcon) ic = NULL; - g_autoptr(GsApp) app = NULL; - -- id = gs_plugin_shell_extensions_id_from_uuid (uuid); -+ id = as_utils_appstream_id_build (uuid); - app = gs_app_new (id); - gs_app_set_metadata (app, "GnomeSoftware::Creator", - gs_plugin_get_name (plugin)); -@@ -540,7 +534,7 @@ gs_plugin_shell_extensions_parse_app (GsPlugin *plugin, - tmp = json_object_get_string_member (json_app, "uuid"); - if (tmp != NULL) { - g_autofree gchar *id = NULL; -- id = gs_plugin_shell_extensions_id_from_uuid (tmp); -+ id = as_utils_appstream_id_build (tmp); - as_app_set_id (app, id); - as_app_add_metadata (app, "shell-extensions::uuid", tmp); - } --- -2.16.2 - diff --git a/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch b/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch index c8d0667..52b3ab2 100644 --- a/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch +++ b/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch @@ -1,53 +1,3 @@ -From 047a077a0ac308fabe002ad3099b8e1f2f24eccd Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 15 Mar 2018 11:23:52 +0100 -Subject: [PATCH] appstream: Don't compare appstream origin to package origin - -Use new as_utils_unique_id_match() from appstream-glib 0.7.8 to ignore -origin when matching AsApp to GsApp. In Fedora, we have all of system -appstream coming from system-installed appstream-data package that has -origin "fedora", but actual packages come from e.g. "updates-testing" -which doesn't match up. ---- - plugins/core/gs-plugin-appstream.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c -index 9ca091112231..3cd95c586eae 100644 ---- a/plugins/core/gs-plugin-appstream.c -+++ b/plugins/core/gs-plugin-appstream.c -@@ -527,11 +527,28 @@ gs_plugin_refine_wildcard (GsPlugin *plugin, - g_autoptr(GsApp) new = NULL; - - /* is compatible */ -+#if AS_CHECK_VERSION(0,7,8) -+ if (!as_utils_unique_id_match (gs_app_get_unique_id (app), -+ as_app_get_unique_id (item), -+ AS_UNIQUE_ID_MATCH_FLAG_SCOPE | -+ AS_UNIQUE_ID_MATCH_FLAG_BUNDLE_KIND | -+ /* don't match origin as AsApp appstream -+ * origin can differ from package origin */ -+ AS_UNIQUE_ID_MATCH_FLAG_KIND | -+ AS_UNIQUE_ID_MATCH_FLAG_ID | -+ AS_UNIQUE_ID_MATCH_FLAG_BRANCH)) { -+ g_debug ("does not match unique ID constraints: %s, %s", -+ gs_app_get_unique_id (app), -+ as_app_get_unique_id (item)); -+ continue; -+ } -+#else - if (!as_utils_unique_id_equal (gs_app_get_unique_id (app), - as_app_get_unique_id (item))) { - g_debug ("does not match unique ID constraints"); - continue; - } -+#endif - - /* does the app have an installation method */ - if (as_app_get_pkgname_default (item) == NULL && --- -2.16.2 - diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c index 3cd95c586eae..8e558824caca 100644 --- a/plugins/core/gs-plugin-appstream.c diff --git a/0001-plugin-loader-Don-t-abort-for-refine-errors.patch b/0001-plugin-loader-Don-t-abort-for-refine-errors.patch deleted file mode 100644 index aac41b1..0000000 --- a/0001-plugin-loader-Don-t-abort-for-refine-errors.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5b24280921bee7fd7ad045641fe7afecf39d8130 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Tue, 13 Mar 2018 22:22:27 +0100 -Subject: [PATCH] plugin loader: Don't abort() for refine errors - -When refining a wildcard app fails, don't abort(), but instead warn and -return NULL. Refining can fail legitimately, e.g. when there's no -network access to refine a system app with pkgdb data. - -https://bugzilla.redhat.com/show_bug.cgi?id=1554986 ---- - lib/gs-plugin-loader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c -index 55d8dde837a5..6e956b82acad 100644 ---- a/lib/gs-plugin-loader.c -+++ b/lib/gs-plugin-loader.c -@@ -3749,7 +3749,7 @@ gs_plugin_loader_app_create (GsPluginLoader *plugin_loader, const gchar *unique_ - plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, NULL); - helper = gs_plugin_loader_helper_new (plugin_loader, plugin_job); - if (!gs_plugin_loader_run_refine (helper, list, NULL, &error)) { -- g_error ("%s", error->message); -+ g_warning ("%s", error->message); - return NULL; - } - --- -2.16.2 - diff --git a/gnome-software.spec b/gnome-software.spec index da788b4..9c92310 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -10,8 +10,8 @@ %global flatpak_version 0.9.4 Name: gnome-software -Version: 3.28.0 -Release: 4%{?dist} +Version: 3.28.1 +Release: 1%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -20,9 +20,7 @@ Source0: https://download.gnome.org/sources/gnome-software/3.28/%{name}-%{vers # /usr/share/backgrounds/f28/default/standard/f28.png from f28-backgrounds-base Source1: f28.png -# Backported from upstream -Patch0: 0001-Revert-Revert-trivial-Use-new-libappstream-glib-to-b.patch -Patch1: 0001-plugin-loader-Don-t-abort-for-refine-errors.patch +# Lower appstream-glib version check as we have new API backported Patch2: 0001-appstream-Don-t-compare-appstream-origin-to-package-.patch BuildRequires: gettext @@ -238,6 +236,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Mon Apr 09 2018 Kalev Lember - 3.28.1-1 +- Update to 3.28.1 + * Thu Mar 15 2018 Kalev Lember - 3.28.0-4 - Fix opening results from gnome-shell search provider diff --git a/sources b/sources index 618b987..4352946 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gnome-software-3.28.0.tar.xz) = 44df87554e996f2a4019ffd88daafba873554ab766a1e075b22ba8ebd6aa758f768449dfa2cce6a1f3700ec732bd2c9a710d428b5e563a456190a3b802411298 +SHA512 (gnome-software-3.28.1.tar.xz) = 9a2b040307c5c4eb38e0cce41cd830f54e68adf6ac02f2aea30c1894ef2ec8e332dd1bfce699602629843cced4c3f660324e0aa8698591a57c40b13a3e474ded SHA512 (f28.png) = cf3a1fa3c042451f6ef9006b29d750ed147a4d4f2f0ad4cdbb4e76089b93f4c319997c4454d068ba94ace3b39444a93816c2a88cd8d1601a0c4d037e30ca5f71 From e52a24f1621d0c2d1a05abd28a93e0e02141c3a6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 18 Apr 2018 16:31:24 +0200 Subject: [PATCH 20/24] Sync F28 upgrade background image with final F28 artwork Update f28.png from f28-backgrounds-base-28.1.3-1.fc28 --- gnome-software.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-software.spec b/gnome-software.spec index 9c92310..4b50f56 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -11,7 +11,7 @@ Name: gnome-software Version: 3.28.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: A software center for GNOME License: GPLv2+ @@ -236,6 +236,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Wed Apr 18 2018 Kalev Lember - 3.28.1-1.1 +- Sync F28 upgrade background image with final F28 artwork + * Mon Apr 09 2018 Kalev Lember - 3.28.1-1 - Update to 3.28.1 diff --git a/sources b/sources index 4352946..85bb692 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gnome-software-3.28.1.tar.xz) = 9a2b040307c5c4eb38e0cce41cd830f54e68adf6ac02f2aea30c1894ef2ec8e332dd1bfce699602629843cced4c3f660324e0aa8698591a57c40b13a3e474ded -SHA512 (f28.png) = cf3a1fa3c042451f6ef9006b29d750ed147a4d4f2f0ad4cdbb4e76089b93f4c319997c4454d068ba94ace3b39444a93816c2a88cd8d1601a0c4d037e30ca5f71 +SHA512 (f28.png) = 468ece7c735d3f11f863c347aa22752ff5805effa47e4e3b97dd3b777ab5705423edc4e51c3491885128e684f243362e79f9f8ec42277bd0673abea48a36d5b2 From 6af7d40eadf578976cf0d98a6805821a80ccc640 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 9 May 2018 11:27:59 +0200 Subject: [PATCH 21/24] Update to 3.28.2 --- .gitignore | 1 + ...on-t-compare-appstream-origin-to-package-.patch | 13 ------------- gnome-software.spec | 14 +++++++------- sources | 2 +- 4 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 0001-appstream-Don-t-compare-appstream-origin-to-package-.patch diff --git a/.gitignore b/.gitignore index cb53297..0121f85 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ /f28.png /gnome-software-3.28.0.tar.xz /gnome-software-3.28.1.tar.xz +/gnome-software-3.28.2.tar.xz diff --git a/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch b/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch deleted file mode 100644 index 52b3ab2..0000000 --- a/0001-appstream-Don-t-compare-appstream-origin-to-package-.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c -index 3cd95c586eae..8e558824caca 100644 ---- a/plugins/core/gs-plugin-appstream.c -+++ b/plugins/core/gs-plugin-appstream.c -@@ -527,7 +527,7 @@ gs_plugin_refine_wildcard (GsPlugin *plugin, - g_autoptr(GsApp) new = NULL; - - /* is compatible */ --#if AS_CHECK_VERSION(0,7,8) -+#if AS_CHECK_VERSION(0,7,7) - if (!as_utils_unique_id_match (gs_app_get_unique_id (app), - as_app_get_unique_id (item), - AS_UNIQUE_ID_MATCH_FLAG_SCOPE | diff --git a/gnome-software.spec b/gnome-software.spec index 4b50f56..70dbc75 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -2,16 +2,16 @@ %global gtk3_version 3.22.4 %global json_glib_version 1.2.0 %global packagekit_version 1.1.1 -%global appstream_glib_version 0.7.7-2 +%global appstream_glib_version 0.7.8 %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.3 +%global fwupd_version 1.0.7 %global flatpak_version 0.9.4 Name: gnome-software -Version: 3.28.1 -Release: 1%{?dist}.1 +Version: 3.28.2 +Release: 1%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -20,9 +20,6 @@ Source0: https://download.gnome.org/sources/gnome-software/3.28/%{name}-%{vers # /usr/share/backgrounds/f28/default/standard/f28.png from f28-backgrounds-base Source1: f28.png -# Lower appstream-glib version check as we have new API backported -Patch2: 0001-appstream-Don-t-compare-appstream-origin-to-package-.patch - BuildRequires: gettext BuildRequires: libxslt BuildRequires: docbook-style-xsl @@ -236,6 +233,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Wed May 09 2018 Kalev Lember - 3.28.2-1 +- Update to 3.28.2 + * Wed Apr 18 2018 Kalev Lember - 3.28.1-1.1 - Sync F28 upgrade background image with final F28 artwork diff --git a/sources b/sources index 85bb692..12f07ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gnome-software-3.28.1.tar.xz) = 9a2b040307c5c4eb38e0cce41cd830f54e68adf6ac02f2aea30c1894ef2ec8e332dd1bfce699602629843cced4c3f660324e0aa8698591a57c40b13a3e474ded +SHA512 (gnome-software-3.28.2.tar.xz) = ca22ea589c19f3c5aae32fb2540646d3b3c8faf86f857dd414caf61b716bc50dea16281955c594a629f684da5ac87eeada6ac68247a9b0545600b739fa436dd7 SHA512 (f28.png) = 468ece7c735d3f11f863c347aa22752ff5805effa47e4e3b97dd3b777ab5705423edc4e51c3491885128e684f243362e79f9f8ec42277bd0673abea48a36d5b2 From cd5d018c416e7c631ac35cb5f0f4a26d9b320750 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 6 Sep 2018 17:43:56 +0200 Subject: [PATCH 22/24] Add artwork for F29 Beta upgrades --- .gitignore | 1 + gnome-software.spec | 8 +++++++- sources | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0121f85..4e53948 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /gnome-software-3.28.0.tar.xz /gnome-software-3.28.1.tar.xz /gnome-software-3.28.2.tar.xz +/f29.png diff --git a/gnome-software.spec b/gnome-software.spec index 70dbc75..e6eec34 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -11,7 +11,7 @@ Name: gnome-software Version: 3.28.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -19,6 +19,8 @@ URL: https://wiki.gnome.org/Apps/Software Source0: https://download.gnome.org/sources/gnome-software/3.28/%{name}-%{version}.tar.xz # /usr/share/backgrounds/f28/default/standard/f28.png from f28-backgrounds-base Source1: f28.png +# /usr/share/backgrounds/f29/default/wide/f29.png from f29-backgrounds-base +Source2: f29.png BuildRequires: gettext BuildRequires: libxslt @@ -131,6 +133,7 @@ FOE # Install upgrade background image mkdir -p %{buildroot}%{_datadir}/gnome-software/backgrounds cp -a %{SOURCE1} %{buildroot}%{_datadir}/gnome-software/backgrounds/ +cp -a %{SOURCE2} %{buildroot}%{_datadir}/gnome-software/backgrounds/ %find_lang %name --with-gnome @@ -233,6 +236,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Thu Sep 06 2018 Kalev Lember - 3.28.2-2 +- Add artwork for F29 Beta upgrades + * Wed May 09 2018 Kalev Lember - 3.28.2-1 - Update to 3.28.2 diff --git a/sources b/sources index 12f07ac..8c11af2 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (gnome-software-3.28.2.tar.xz) = ca22ea589c19f3c5aae32fb2540646d3b3c8faf86f857dd414caf61b716bc50dea16281955c594a629f684da5ac87eeada6ac68247a9b0545600b739fa436dd7 SHA512 (f28.png) = 468ece7c735d3f11f863c347aa22752ff5805effa47e4e3b97dd3b777ab5705423edc4e51c3491885128e684f243362e79f9f8ec42277bd0673abea48a36d5b2 +SHA512 (f29.png) = 7bcb036c9edf069e65edeabbb08460321dedf996d40ae71a8e1e1ba4131288e60a15c5c7e3115229a2850cade018f0ff935da3ee439768597e37830cad5e77bb From 525e6b3c003b8651a00e89f7b649889f62784aca Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 8 Oct 2018 13:16:50 +0200 Subject: [PATCH 23/24] Backport fixes for N+2 distro upgrades https://bugzilla.redhat.com/show_bug.cgi?id=1628497 --- ...ro-version-in-Fedora-distro-upgrade-.patch | 55 ++++++++++++++ ...distro-upgrades-in-the-plugin-loader.patch | 76 +++++++++++++++++++ gnome-software.spec | 8 +- 3 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 0001-Include-the-distro-version-in-Fedora-distro-upgrade-.patch create mode 100644 0002-Sort-distro-upgrades-in-the-plugin-loader.patch diff --git a/0001-Include-the-distro-version-in-Fedora-distro-upgrade-.patch b/0001-Include-the-distro-version-in-Fedora-distro-upgrade-.patch new file mode 100644 index 0000000..f51c077 --- /dev/null +++ b/0001-Include-the-distro-version-in-Fedora-distro-upgrade-.patch @@ -0,0 +1,55 @@ +From 7afc2c4e3f4ffac704b28098eae3136313d791d3 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Mon, 8 Oct 2018 11:02:50 +0200 +Subject: [PATCH 1/2] Include the distro version in Fedora distro upgrade app + IDs + +If we use just "org.fedoraproject.Fedora", GsAppList deduplicates based +on the app ID and only keeps on of the returned apps. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1628497 +--- + .../gs-plugin-fedora-pkgdb-collections.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c b/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c +index fc644ad47..5b8137e3d 100644 +--- a/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c ++++ b/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c +@@ -1,6 +1,6 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * +- * Copyright (C) 2016-2017 Kalev Lember ++ * Copyright (C) 2016-2018 Kalev Lember + * Copyright (C) 2017 Richard Hughes + * + * Licensed under the GNU General Public License Version 2 +@@ -280,6 +280,7 @@ static GsApp * + _create_upgrade_from_info (GsPlugin *plugin, PkgdbItem *item) + { + GsApp *app; ++ g_autofree gchar *app_id = NULL; + g_autofree gchar *app_version = NULL; + g_autofree gchar *background = NULL; + g_autofree gchar *cache_key = NULL; +@@ -293,7 +294,7 @@ _create_upgrade_from_info (GsPlugin *plugin, PkgdbItem *item) + if (app != NULL) + return app; + +- /* create app */ ++ app_id = g_strdup_printf ("org.fedoraproject.Fedora-%u", item->version); + app_version = g_strdup_printf ("%u", item->version); + + /* icon from disk */ +@@ -302,7 +303,7 @@ _create_upgrade_from_info (GsPlugin *plugin, PkgdbItem *item) + as_icon_set_filename (ic, "/usr/share/pixmaps/fedora-logo-sprite.png"); + + /* create */ +- app = gs_app_new ("org.fedoraproject.Fedora"); ++ app = gs_app_new (app_id); + gs_app_set_state (app, AS_APP_STATE_AVAILABLE); + gs_app_set_kind (app, AS_APP_KIND_OS_UPGRADE); + gs_app_set_name (app, GS_APP_QUALITY_LOWEST, item->name); +-- +2.19.1 + diff --git a/0002-Sort-distro-upgrades-in-the-plugin-loader.patch b/0002-Sort-distro-upgrades-in-the-plugin-loader.patch new file mode 100644 index 0000000..d68517a --- /dev/null +++ b/0002-Sort-distro-upgrades-in-the-plugin-loader.patch @@ -0,0 +1,76 @@ +From be925f12287faee9d4c65635a3e69d18617b0213 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Mon, 8 Oct 2018 11:34:15 +0200 +Subject: [PATCH 2/2] Sort distro upgrades in the plugin loader + +... so that we can rely on the order in UI code. +--- + lib/gs-plugin-loader.c | 13 +++++++++++++ + src/gs-update-monitor.c | 5 +++-- + src/gs-updates-page.c | 3 ++- + 3 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c +index 2fb02e3c6..033438a88 100644 +--- a/lib/gs-plugin-loader.c ++++ b/lib/gs-plugin-loader.c +@@ -1484,6 +1484,13 @@ gs_plugin_loader_app_sort_match_value_cb (GsApp *app1, GsApp *app2, gpointer use + return 0; + } + ++static gint ++gs_plugin_loader_app_sort_version_cb (GsApp *app1, GsApp *app2, gpointer user_data) ++{ ++ return as_utils_vercmp (gs_app_get_version (app1), ++ gs_app_get_version (app2)); ++} ++ + /******************************************************************************/ + + static gboolean +@@ -3673,6 +3680,12 @@ gs_plugin_loader_job_process_async (GsPluginLoader *plugin_loader, + gs_plugin_loader_app_sort_name_cb); + } + break; ++ case GS_PLUGIN_ACTION_GET_DISTRO_UPDATES: ++ if (gs_plugin_job_get_sort_func (plugin_job) == NULL) { ++ gs_plugin_job_set_sort_func (plugin_job, ++ gs_plugin_loader_app_sort_version_cb); ++ } ++ break; + default: + break; + } +diff --git a/src/gs-update-monitor.c b/src/gs-update-monitor.c +index 3441b161f..2f39ae0bd 100644 +--- a/src/gs-update-monitor.c ++++ b/src/gs-update-monitor.c +@@ -308,8 +308,9 @@ get_upgrades_finished_cb (GObject *object, + g_settings_set (monitor->settings, "upgrade-notification-timestamp", "x", + g_date_time_to_unix (now)); + +- /* just get the first result : FIXME, do we sort these by date? */ +- app = gs_app_list_index (apps, 0); ++ /* rely on the app list already being sorted with the ++ * chronologically newest release last */ ++ app = gs_app_list_index (apps, gs_app_list_length (apps) - 1); + + /* TRANSLATORS: this is a distro upgrade, the replacement would be the + * distro name, e.g. 'Fedora' */ +diff --git a/src/gs-updates-page.c b/src/gs-updates-page.c +index cd9db05d4..e84293e03 100644 +--- a/src/gs-updates-page.c ++++ b/src/gs-updates-page.c +@@ -1084,7 +1084,8 @@ gs_updates_page_get_upgrades_cb (GObject *source_object, + gs_updates_page_clear_flag (self, GS_UPDATES_PAGE_FLAG_HAS_UPGRADES); + gtk_widget_set_visible (self->upgrade_banner, FALSE); + } else { +- /* rely on the app list already being sorted */ ++ /* rely on the app list already being sorted with the ++ * chronologically newest release last */ + GsApp *app = gs_app_list_index (list, gs_app_list_length (list) - 1); + g_debug ("got upgrade %s", gs_app_get_id (app)); + gs_upgrade_banner_set_app (GS_UPGRADE_BANNER (self->upgrade_banner), app); +-- +2.19.1 + diff --git a/gnome-software.spec b/gnome-software.spec index e6eec34..0f74fa4 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -11,7 +11,7 @@ Name: gnome-software Version: 3.28.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -22,6 +22,9 @@ Source1: f28.png # /usr/share/backgrounds/f29/default/wide/f29.png from f29-backgrounds-base Source2: f29.png +Patch0: 0001-Include-the-distro-version-in-Fedora-distro-upgrade-.patch +Patch1: 0002-Sort-distro-upgrades-in-the-plugin-loader.patch + BuildRequires: gettext BuildRequires: libxslt BuildRequires: docbook-style-xsl @@ -236,6 +239,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Mon Oct 08 2018 Kalev Lember - 3.28.2-3 +- Backport fixes for N+2 distro upgrades (#1628497) + * Thu Sep 06 2018 Kalev Lember - 3.28.2-2 - Add artwork for F29 Beta upgrades From bf0a4b6273c28474941868ad64ba9613911c8773 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 11 Oct 2018 19:32:43 -0700 Subject: [PATCH 24/24] Backport MR#116 to fix bug with generic updates (#1638563) --- 116.patch | 38 ++++++++++++++++++++++++++++++++++++++ gnome-software.spec | 10 +++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 116.patch diff --git a/116.patch b/116.patch new file mode 100644 index 0000000..cf9d7e8 --- /dev/null +++ b/116.patch @@ -0,0 +1,38 @@ +From 086f4b4bf3ce478a9a1cb009f56a7c08d1aa6e57 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 11 Oct 2018 19:12:01 -0700 +Subject: [PATCH] Ensure generic-updates plugin runs after packagekit-refine + +9eab01082b07acd525b8a390ab6b43136cf400a5 made generic-updates +check the 'scope' and 'kind' for a package update before adding +it to the generic 'OS Updates' "app" which is used to display +updates for packages that aren't appdata-ified. The 'scope' and +'kind' for package updates are set by packagekit-refine...but +that change did not ensure that generic-updates runs *after* +packagekit-refine. This can result in gnome-software failing to +'see' these generic updates on a first update scan, and only +picking them up on a retry. To fix this, we should ensure that +packagekit-refine runs before generic-updates. + +https://bugzilla.redhat.com/show_bug.cgi?id=1638563 + +Signed-off-by: Adam Williamson +--- + plugins/core/gs-plugin-generic-updates.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/core/gs-plugin-generic-updates.c b/plugins/core/gs-plugin-generic-updates.c +index d8e2db39..ef79c65b 100644 +--- a/plugins/core/gs-plugin-generic-updates.c ++++ b/plugins/core/gs-plugin-generic-updates.c +@@ -28,6 +28,7 @@ void + gs_plugin_initialize (GsPlugin *plugin) + { + gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream"); ++ gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "packagekit-refine"); + } + + static gboolean +-- +2.18.1 + diff --git a/gnome-software.spec b/gnome-software.spec index 0f74fa4..88c46ab 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -11,7 +11,7 @@ Name: gnome-software Version: 3.28.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -24,6 +24,11 @@ Source2: f29.png Patch0: 0001-Include-the-distro-version-in-Fedora-distro-upgrade-.patch Patch1: 0002-Sort-distro-upgrades-in-the-plugin-loader.patch +# Fixes an ordering issue which often causes the first scan for updates +# to miss 'generic' ones +# https://gitlab.gnome.org/GNOME/gnome-software/merge_requests/116 +# https://bugzilla.redhat.com/show_bug.cgi?id=1638563 +Patch2: 116.patch BuildRequires: gettext BuildRequires: libxslt @@ -239,6 +244,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_mandir}/man1/gnome-software-editor.1* %changelog +* Thu Oct 11 2018 Adam Williamson - 3.28.2-4 +- Backport MR#116 to fix bug with generic updates (#1638563) + * Mon Oct 08 2018 Kalev Lember - 3.28.2-3 - Backport fixes for N+2 distro upgrades (#1628497)