diff --git a/.gitignore b/.gitignore index 9e15f98..0912a52 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,6 @@ /gnome-software-3.24.0.tar.xz /gnome-software-3.24.1.tar.xz /gnome-software-3.24.2.tar.xz +/gnome-software-3.24.3.tar.xz +/f27.png +/f28.png diff --git a/0001-Show-the-highest-available-distro-upgrade.patch b/0001-Show-the-highest-available-distro-upgrade.patch new file mode 100644 index 0000000..fd7b7a3 --- /dev/null +++ b/0001-Show-the-highest-available-distro-upgrade.patch @@ -0,0 +1,34 @@ +From 39fe345ab25a5dc68db7ddc078f772ec78e62e35 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +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-updates-page.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gs-updates-page.c b/src/gs-updates-page.c +index ae3aac1a..994513ed 100644 +--- a/src/gs-updates-page.c ++++ b/src/gs-updates-page.c +@@ -547,7 +547,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 { +- 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_updates_page_set_flag (self, GS_UPDATES_PAGE_FLAG_HAS_UPGRADES); +-- +2.14.2 + diff --git a/0001-Sort-the-upgrades-list-chronologically.patch b/0001-Sort-the-upgrades-list-chronologically.patch new file mode 100644 index 0000000..eff4ef1 --- /dev/null +++ b/0001-Sort-the-upgrades-list-chronologically.patch @@ -0,0 +1,40 @@ +From c04bf023d6d0ba50d3c7a27403dcc3c052ed22e7 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Tue, 13 Mar 2018 20:02:13 +0000 +Subject: [PATCH] Sort the upgrades list chronologically + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1553792 +--- + lib/gs-plugin-loader.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c +index 7491d12f..38a3e0e9 100644 +--- a/lib/gs-plugin-loader.c ++++ b/lib/gs-plugin-loader.c +@@ -1357,6 +1357,13 @@ gs_plugin_loader_get_updates_finish (GsPluginLoader *plugin_loader, + + /******************************************************************************/ + ++static gint ++gs_plugin_loader_app_sort_version_cb (GsApp *app1, GsApp *app2, gpointer user_data) ++{ ++ return g_strcmp0 (gs_app_get_version (app1), ++ gs_app_get_version (app2)); ++} ++ + static void + gs_plugin_loader_get_distro_upgrades_thread_cb (GTask *task, + gpointer object, +@@ -1378,6 +1385,9 @@ gs_plugin_loader_get_distro_upgrades_thread_cb (GTask *task, + gs_app_list_filter (job->list, gs_plugin_loader_app_set_prio, plugin_loader); + gs_app_list_filter_duplicates (job->list, GS_APP_LIST_FILTER_FLAG_NONE); + ++ /* sort with the chronologically newest release last */ ++ gs_app_list_sort (job->list, gs_plugin_loader_app_sort_version_cb, NULL); ++ + /* success */ + g_task_return_pointer (task, g_object_ref (job->list), (GDestroyNotify) g_object_unref); + } +-- +2.14.3 diff --git a/gnome-software.spec b/gnome-software.spec index 2dfa996..c9d20b8 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -13,13 +13,21 @@ %bcond_without packagekit Name: gnome-software -Version: 3.24.2 -Release: 1%{?dist} +Version: 3.24.3 +Release: 6%{?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.24/%{name}-%{version}.tar.xz +# /usr/share/backgrounds/f27/default/standard/f27.png from f27-backgrounds-base +Source1: f27.png +# /usr/share/backgrounds/f28/default/standard/f28.png from f28-backgrounds-base +Source2: f28.png + +# Backported from upstream +Patch0: 0001-Show-the-highest-available-distro-upgrade.patch +Patch1: 0001-Sort-the-upgrades-list-chronologically.patch BuildRequires: gettext BuildRequires: libxslt @@ -103,6 +111,9 @@ make %{?_smp_mflags} rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/*.la +# Remove the Fedora tagger plugin now that the service is being discontinued +rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-tagger-usage.so + # make the software center load faster desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \ --set-key=X-AppInstall-Package --set-value=%{name} @@ -113,6 +124,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 @@ -142,6 +158,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 %{_datadir}/appdata/org.gnome.Software.Plugin.Epiphany.metainfo.xml @@ -157,7 +174,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-distro-upgrades.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 @@ -208,6 +224,28 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Wed Apr 18 2018 Kalev Lember - 3.24.3-6 +- Sync F28 upgrade background image with final F28 artwork + +* Tue Mar 13 2018 Richard Hughes - 3.24.3-5 +- Show the chronologically newest upgrade by sorting the results. +- Resolves: #1553792 + +* Fri Mar 02 2018 Kalev Lember - 3.24.3-4 +- Ship a background image for F28 beta upgrades +- Remove the Fedora tagger plugin now that the service is being discontinued + +* Tue Oct 24 2017 Kalev Lember - 3.24.3-3 +- Fix showing F25->F27 upgrades (#1494061) + +* Tue Oct 24 2017 Kalev Lember - 3.24.3-2 +- Ship a background image for F27 upgrades + +* Mon May 15 2017 Richard Hughes - 3.24.3-1 +- Update to 3.23.3 +- Fix a common crash when installing flatpakrepo files +- Ensure we show the banner when upgrades are available + * Tue May 09 2017 Kalev Lember - 3.24.2-1 - Update to 3.24.2 diff --git a/sources b/sources index 70f82fa..259cff3 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (gnome-software-3.24.2.tar.xz) = 894f02484f5b6f7ba272fe05b83688d9ebc0c48e3519e0f79768df030d8e25fcb65349bb732877ddc65e013474dc1fb4be2f5b15f2e070cda6671a4b651b66ef +SHA512 (gnome-software-3.24.3.tar.xz) = 9f5b604fa78528ab9ad9f1a1ede2fd534b98cb17fd62b82c40c6ddeddb911283f41f409771dc558a0cd98a9399688667930a618a0f21974e2d2b18271dc5d673 +SHA512 (f27.png) = 083a7ba36f09d0a78d67dcc89dfe1fcab0466a89dd54d837a806c26177dcc6216185693fff63144bb1e406a4353e6b025bd7d7e1373111db364cde50a53d7b32 +SHA512 (f28.png) = 468ece7c735d3f11f863c347aa22752ff5805effa47e4e3b97dd3b777ab5705423edc4e51c3491885128e684f243362e79f9f8ec42277bd0673abea48a36d5b2