Update to 3.26.2

.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

0001-Don-t-error-out-for-over-500-results.patch

@@ -1,41 +0,0 @@
-From 993faac2759316fde53a61109fc62fd271f315c2 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-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
-

0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch

@@ -1,44 +0,0 @@
-From 1a4c98b4ffa089985806a76a73d741465f3cff83 Mon Sep 17 00:00:00 2001
-From: Joaquim Rocha <jrocha@endlessm.com>
-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
-

gnome-software.spec

@@ -13,18 +13,14 @@
 %bcond_without packagekit
 
 Name:      gnome-software
-Version:   3.26.1
+Version:   3.26.2
-Release:   5%{?dist}
+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
@@ -246,6 +242,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_mandir}/man1/gnome-software-editor.1*
 
 %changelog
+* Thu Nov 09 2017 Kalev Lember <klember@redhat.com> - 3.26.2-1
+- Update to 3.26.2
+
 * Tue Oct 31 2017 Kalev Lember <klember@redhat.com> - 3.26.1-5
 - Enable the rpm-ostree plugin
 

sources

@@ -1 +1 @@
-SHA512 (gnome-software-3.26.1.tar.xz) = 4996de18a6b1b6f04d72cc4c9c71104acdf6157abf043348e2929ad526d47400976d2e3b88095fbff19a392fd5130219c519cc6c8dd2b823f2550a8fd8aa67a0
+SHA512 (gnome-software-3.26.2.tar.xz) = 18c7b7b2e5c1be4c9e89e885ea51e8486c0cc05418e3a448dc2489b42f73b40055cacd1da96e28dc7d840bd3c4db8c62a5974e725304b4bf2b722401eeb5f7bd