Fix showing F25->F27 upgrades

https://bugzilla.redhat.com/show_bug.cgi?id=1494061

.gitignore

@@ -67,3 +67,10 @@
 /gnome-software-3.22.0.tar.xz
 /gnome-software-3.22.1.tar.xz
 /gnome-software-3.22.2.tar.xz
+/gnome-software-3.22.3.tar.xz
+/gnome-software-3.22.4.tar.xz
+/gnome-software-3.22.5.tar.xz
+/gnome-software-3.22.6.tar.xz
+/gnome-software-3.22.7.tar.xz
+/f26.png
+/f27.png

0001-Show-the-highest-available-distro-upgrade.patch

@@ -0,0 +1,34 @@
+From 2218f85e908e8fdea64771d03b0d4fc165b73429 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Tue, 24 Oct 2017 14:37:42 +0200
+Subject: [PATCH] Show the highest available distro upgrade
+
+The intent was always to show the highest version (e.g. F27 over F26),
+but the implementation broke when GsAppList switched from list to array,
+reversing the sort order.
+
+This commit switches the UI code over to relying on getting upgrades in
+the ascending sort order from the plugin loader.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1494061
+---
+ src/gs-shell-updates.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gs-shell-updates.c b/src/gs-shell-updates.c
+index 98e49033..d5869142 100644
+--- a/src/gs-shell-updates.c
++++ b/src/gs-shell-updates.c
+@@ -559,7 +559,8 @@ gs_shell_updates_get_upgrades_cb (GObject *source_object,
+ 		g_debug ("updates-shell: no upgrades to show");
+ 		gs_shell_updates_clear_flag (self, GS_SHELL_UPDATES_FLAG_HAS_UPGRADES);
+ 	} else {
+-		GsApp *app = gs_app_list_index (list, 0);
++		/* rely on the app list already being sorted */
++		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);
+ 		gs_shell_updates_set_flag (self, GS_SHELL_UPDATES_FLAG_HAS_UPGRADES);
+-- 
+2.14.2
+

gnome-software.spec

@@ -1,25 +1,32 @@
 %global glib2_version 2.46.0
-%global gtk3_version 3.20.0
+%global gtk3_version 3.22.4
 %global json_glib_version 1.1.1
 %global packagekit_version 1.1.1
-%global appstream_glib_version 0.6.5
+%global appstream_glib_version 0.6.9
 %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.7.3
-%global flatpak_version 0.6.12
+%global flatpak_version 0.8.0
 
 # this should be set using "--without packagekit" when atomic
 %bcond_without packagekit
 
 Name:      gnome-software
-Version:   3.22.2
-Release:   1%{?dist}
+Version:   3.22.7
+Release:   4%{?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.22/%{name}-%{version}.tar.xz
+# /usr/share/backgrounds/f26/default/standard/f26.png from f26-backgrounds-base
+Source1:   f26.png
+# /usr/share/backgrounds/f27/default/standard/f27.png from f27-backgrounds-base
+Source2:   f27.png
+
+# Backported from upstream
+Patch0:    0001-Show-the-highest-available-distro-upgrade.patch
 
 BuildRequires: gettext
 BuildRequires: intltool
@@ -82,7 +89,7 @@ These development files are for building gnome-software plugins outside
 the source tree. Most users do not need this subpackage installed.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure \
@@ -111,6 +118,11 @@ cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschem
 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' ]
 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
 
 %check
@@ -140,6 +152,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/appdata/*.appdata.xml
 %{_mandir}/man1/gnome-software.1.gz
 %{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/gnome-software/backgrounds/
 %{_datadir}/gnome-software/featured-*.svg
 %{_datadir}/gnome-software/featured-*.jpg
 %dir %{_libdir}/gs-plugins-%{gs_plugin_version}
@@ -151,8 +164,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-distro-upgrades.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-tagger-usage.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak-system.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak-user.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_hardcoded-blacklist.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-featured.so
@@ -199,6 +211,33 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gtk-doc/html/gnome-software
 
 %changelog
+* Tue Oct 24 2017 Kalev Lember <klember@redhat.com> - 3.22.7-4
+- Fix showing F25->F27 upgrades (#1494061)
+
+* Tue Oct 24 2017 Kalev Lember <klember@redhat.com> - 3.22.7-3
+- Ship a background image for F27 upgrades
+
+* Mon Jul 17 2017 Kalev Lember <klember@redhat.com> - 3.22.7-2
+- Ship a background image for F26 upgrades
+
+* Tue Mar 14 2017 Kalev Lember <klember@redhat.com> - 3.22.7-1
+- Update to 3.22.7
+
+* Wed Mar 08 2017 Kalev Lember <klember@redhat.com> - 3.22.6-1
+- Update to 3.22.6
+
+* Mon Jan 16 2017 Kalev Lember <klember@redhat.com> - 3.22.5-1
+- Update to 3.22.5
+
+* Fri Dec 16 2016 Kalev Lember <klember@redhat.com> - 3.22.4-2
+- Fix update notes to show up on the updates page
+
+* Thu Dec 08 2016 Kalev Lember <klember@redhat.com> - 3.22.4-1
+- Update to 3.22.4
+
+* Thu Dec 01 2016 Kalev Lember <klember@redhat.com> - 3.22.3-1
+- Update to 3.22.3
+
 * Tue Nov 08 2016 Kalev Lember <klember@redhat.com> - 3.22.2-1
 - Update to 3.22.2
 

sources

@@ -1 +1,3 @@
-23e592213f28ac3c01fa5ff7c1598505  gnome-software-3.22.2.tar.xz
+SHA512 (gnome-software-3.22.7.tar.xz) = 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825
+SHA512 (f26.png) = fdc5407485c5d2a0bf805678a3762543d57bae266c41b8519e89433da1bd925ed8ca136340c936bc4445639a7d0b535c1a020d57eebc0cc3141c8b677ac9ff58
+SHA512 (f27.png) = 083a7ba36f09d0a78d67dcc89dfe1fcab0466a89dd54d837a806c26177dcc6216185693fff63144bb1e406a4353e6b025bd7d7e1373111db364cde50a53d7b32