From c422ba83cc9346f1c00979259bb10f99068b27d8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 1 Dec 2016 17:03:34 +0100 Subject: [PATCH 1/9] Update to 3.22.3 --- .gitignore | 1 + gnome-software.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 60b9640..750ecb1 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /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 diff --git a/gnome-software.spec b/gnome-software.spec index 48b0ef7..b021a79 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -1,5 +1,5 @@ %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 @@ -13,7 +13,7 @@ %bcond_without packagekit Name: gnome-software -Version: 3.22.2 +Version: 3.22.3 Release: 1%{?dist} Summary: A software center for GNOME @@ -199,6 +199,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Thu Dec 01 2016 Kalev Lember - 3.22.3-1 +- Update to 3.22.3 + * Tue Nov 08 2016 Kalev Lember - 3.22.2-1 - Update to 3.22.2 diff --git a/sources b/sources index be0cd6f..cb20c02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23e592213f28ac3c01fa5ff7c1598505 gnome-software-3.22.2.tar.xz +b5dda971eb08f4de7e5bc2eefa65d2d9 gnome-software-3.22.3.tar.xz From b47f1f40dc43fd0dc75696b5688778dbd142f2df Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 8 Dec 2016 14:17:37 +0100 Subject: [PATCH 2/9] Update to 3.22.4 --- .gitignore | 1 + gnome-software.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 750ecb1..3e469b4 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /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 diff --git a/gnome-software.spec b/gnome-software.spec index b021a79..53f7b6a 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -13,7 +13,7 @@ %bcond_without packagekit Name: gnome-software -Version: 3.22.3 +Version: 3.22.4 Release: 1%{?dist} Summary: A software center for GNOME @@ -199,6 +199,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Thu Dec 08 2016 Kalev Lember - 3.22.4-1 +- Update to 3.22.4 + * Thu Dec 01 2016 Kalev Lember - 3.22.3-1 - Update to 3.22.3 diff --git a/sources b/sources index cb20c02..7b289f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5dda971eb08f4de7e5bc2eefa65d2d9 gnome-software-3.22.3.tar.xz +fedcd700b4729c227bcc48f5178bbaa4 gnome-software-3.22.4.tar.xz From b31626a15babda8a12c7094febfd73734020d4b2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Dec 2016 21:43:16 +0100 Subject: [PATCH 3/9] Fix update notes to show up on the updates page --- ...ckagekit-Fix-refining-update-details.patch | 33 +++++++++++++++++++ gnome-software.spec | 9 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-packagekit-Fix-refining-update-details.patch diff --git a/0001-packagekit-Fix-refining-update-details.patch b/0001-packagekit-Fix-refining-update-details.patch new file mode 100644 index 0000000..e32eba9 --- /dev/null +++ b/0001-packagekit-Fix-refining-update-details.patch @@ -0,0 +1,33 @@ +From 35a3d96907ada3dc7ca32527051729beb6b9f6a4 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 15 Dec 2016 09:36:01 +0100 +Subject: [PATCH] packagekit: Fix refining update details + +This makes the update notes correctly show up on the updates page again. + +Note that this wasn't doing an array out of bounds write, even though it +looks like that at first glance: the memory allocated for the array was +always one element larger to accomodate the trailing nul and only this +got overwritten. + +https://bugzilla.gnome.org/show_bug.cgi?id=775884 +--- + src/plugins/gs-plugin-packagekit-refine.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c +index 86a51ff..341a154 100644 +--- a/src/plugins/gs-plugin-packagekit-refine.c ++++ b/src/plugins/gs-plugin-packagekit-refine.c +@@ -379,7 +379,7 @@ gs_plugin_packagekit_refine_updatedetails (GsPlugin *plugin, + for (i = 0; i < gs_app_list_length (list); i++) { + app = gs_app_list_index (list, i); + package_id = gs_app_get_source_id_default (app); +- package_ids[i++] = package_id; ++ package_ids[i] = package_id; + } + + data.app = NULL; +-- +2.9.3 + diff --git a/gnome-software.spec b/gnome-software.spec index 53f7b6a..6619e71 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,13 +14,16 @@ Name: gnome-software Version: 3.22.4 -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.22/%{name}-%{version}.tar.xz +# Backported from upstream +Patch0: 0001-packagekit-Fix-refining-update-details.patch + BuildRequires: gettext BuildRequires: intltool BuildRequires: libxslt @@ -83,6 +86,7 @@ the source tree. Most users do not need this subpackage installed. %prep %setup -q +%patch0 -p1 %build %configure \ @@ -199,6 +203,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Fri Dec 16 2016 Kalev Lember - 3.22.4-2 +- Fix update notes to show up on the updates page + * Thu Dec 08 2016 Kalev Lember - 3.22.4-1 - Update to 3.22.4 From 6cebc3a92ad4edc2ccec1573c3fc6a24550b2a99 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 16 Jan 2017 17:08:03 +0100 Subject: [PATCH 4/9] Update to 3.22.5 --- .gitignore | 1 + ...ckagekit-Fix-refining-update-details.patch | 33 ------------------- gnome-software.spec | 13 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 0001-packagekit-Fix-refining-update-details.patch diff --git a/.gitignore b/.gitignore index 3e469b4..2acd8cf 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /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 diff --git a/0001-packagekit-Fix-refining-update-details.patch b/0001-packagekit-Fix-refining-update-details.patch deleted file mode 100644 index e32eba9..0000000 --- a/0001-packagekit-Fix-refining-update-details.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 35a3d96907ada3dc7ca32527051729beb6b9f6a4 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 15 Dec 2016 09:36:01 +0100 -Subject: [PATCH] packagekit: Fix refining update details - -This makes the update notes correctly show up on the updates page again. - -Note that this wasn't doing an array out of bounds write, even though it -looks like that at first glance: the memory allocated for the array was -always one element larger to accomodate the trailing nul and only this -got overwritten. - -https://bugzilla.gnome.org/show_bug.cgi?id=775884 ---- - src/plugins/gs-plugin-packagekit-refine.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c -index 86a51ff..341a154 100644 ---- a/src/plugins/gs-plugin-packagekit-refine.c -+++ b/src/plugins/gs-plugin-packagekit-refine.c -@@ -379,7 +379,7 @@ gs_plugin_packagekit_refine_updatedetails (GsPlugin *plugin, - for (i = 0; i < gs_app_list_length (list); i++) { - app = gs_app_list_index (list, i); - package_id = gs_app_get_source_id_default (app); -- package_ids[i++] = package_id; -+ package_ids[i] = package_id; - } - - data.app = NULL; --- -2.9.3 - diff --git a/gnome-software.spec b/gnome-software.spec index 6619e71..79d6ce6 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -2,7 +2,7 @@ %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.6 %global libsoup_version 2.51.92 %global gsettings_desktop_schemas_version 3.11.5 %global gnome_desktop_version 3.17.92 @@ -13,17 +13,14 @@ %bcond_without packagekit Name: gnome-software -Version: 3.22.4 -Release: 2%{?dist} +Version: 3.22.5 +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.22/%{name}-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-packagekit-Fix-refining-update-details.patch - BuildRequires: gettext BuildRequires: intltool BuildRequires: libxslt @@ -86,7 +83,6 @@ the source tree. Most users do not need this subpackage installed. %prep %setup -q -%patch0 -p1 %build %configure \ @@ -203,6 +199,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Mon Jan 16 2017 Kalev Lember - 3.22.5-1 +- Update to 3.22.5 + * Fri Dec 16 2016 Kalev Lember - 3.22.4-2 - Fix update notes to show up on the updates page diff --git a/sources b/sources index 7b289f5..005ff7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fedcd700b4729c227bcc48f5178bbaa4 gnome-software-3.22.4.tar.xz +SHA512 (gnome-software-3.22.5.tar.xz) = e3a82af28738418981bc00c7307b45887ddb14bef676ae360b46193166d910ee943466fc2b2c4fe21e3555ef8e0aab95f111ffe2f3ec496a9509d9fc81b1951c From b821cf4afcde2d90fe52bec0be1e2d9440fc356f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 8 Mar 2017 15:38:46 +0100 Subject: [PATCH 5/9] Update to 3.22.6 --- .gitignore | 1 + gnome-software.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2acd8cf..2fe87c3 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /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 diff --git a/gnome-software.spec b/gnome-software.spec index 79d6ce6..0ee555f 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -2,18 +2,18 @@ %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.6 +%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.5 +Version: 3.22.6 Release: 1%{?dist} Summary: A software center for GNOME @@ -151,8 +151,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 +198,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Wed Mar 08 2017 Kalev Lember - 3.22.6-1 +- Update to 3.22.6 + * Mon Jan 16 2017 Kalev Lember - 3.22.5-1 - Update to 3.22.5 diff --git a/sources b/sources index 005ff7b..cd748f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.22.5.tar.xz) = e3a82af28738418981bc00c7307b45887ddb14bef676ae360b46193166d910ee943466fc2b2c4fe21e3555ef8e0aab95f111ffe2f3ec496a9509d9fc81b1951c +SHA512 (gnome-software-3.22.6.tar.xz) = c115fd905f5cd12463f86a76c65553cef7764f6ff2c628ca2e57007b6f813dc23883ca07006dc9d361f214ea7b69c96151e8142ed25bfb87a7a0f213b9256b24 From 6594c6f2b0135da4848ec377a1cbfba849292c5a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 14 Mar 2017 12:09:21 +0100 Subject: [PATCH 6/9] Update to 3.22.7 --- .gitignore | 1 + gnome-software.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2fe87c3..c025909 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /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 diff --git a/gnome-software.spec b/gnome-software.spec index 0ee555f..7514751 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -13,7 +13,7 @@ %bcond_without packagekit Name: gnome-software -Version: 3.22.6 +Version: 3.22.7 Release: 1%{?dist} Summary: A software center for GNOME @@ -198,6 +198,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Tue Mar 14 2017 Kalev Lember - 3.22.7-1 +- Update to 3.22.7 + * Wed Mar 08 2017 Kalev Lember - 3.22.6-1 - Update to 3.22.6 diff --git a/sources b/sources index cd748f6..b8469bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-3.22.6.tar.xz) = c115fd905f5cd12463f86a76c65553cef7764f6ff2c628ca2e57007b6f813dc23883ca07006dc9d361f214ea7b69c96151e8142ed25bfb87a7a0f213b9256b24 +SHA512 (gnome-software-3.22.7.tar.xz) = 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825 From 44f2f8a6ed510452e78d0e9bcb762851968b4090 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 15 Jul 2017 17:38:44 +0200 Subject: [PATCH 7/9] Ship a background image for F26 upgrades --- .gitignore | 1 + gnome-software.spec | 12 +++++++++++- sources | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c025909..8febc30 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /gnome-software-3.22.5.tar.xz /gnome-software-3.22.6.tar.xz /gnome-software-3.22.7.tar.xz +/f26.png diff --git a/gnome-software.spec b/gnome-software.spec index 7514751..c4c21ed 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,12 +14,14 @@ Name: gnome-software Version: 3.22.7 -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.22/%{name}-%{version}.tar.xz +# /usr/share/backgrounds/f26/default/standard/f26.png from f26-backgrounds-base +Source1: f26.png BuildRequires: gettext BuildRequires: intltool @@ -111,6 +113,10 @@ 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/ + %find_lang %name --with-gnome %check @@ -140,6 +146,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} @@ -198,6 +205,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Mon Jul 17 2017 Kalev Lember - 3.22.7-2 +- Ship a background image for F26 upgrades + * Tue Mar 14 2017 Kalev Lember - 3.22.7-1 - Update to 3.22.7 diff --git a/sources b/sources index b8469bf..bd94e90 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (gnome-software-3.22.7.tar.xz) = 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825 +SHA512 (f26.png) = fdc5407485c5d2a0bf805678a3762543d57bae266c41b8519e89433da1bd925ed8ca136340c936bc4445639a7d0b535c1a020d57eebc0cc3141c8b677ac9ff58 From cadd4ba4589301ba1edf2dccff50c6d36045c4e4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 Oct 2017 13:19:49 +0200 Subject: [PATCH 8/9] Ship a background image for F27 upgrades --- .gitignore | 1 + gnome-software.spec | 8 +++++++- sources | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8febc30..e2e4e24 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /gnome-software-3.22.6.tar.xz /gnome-software-3.22.7.tar.xz /f26.png +/f27.png diff --git a/gnome-software.spec b/gnome-software.spec index c4c21ed..b27b817 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,7 +14,7 @@ Name: gnome-software Version: 3.22.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -22,6 +22,8 @@ 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 BuildRequires: gettext BuildRequires: intltool @@ -116,6 +118,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 @@ -205,6 +208,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Tue Oct 24 2017 Kalev Lember - 3.22.7-3 +- Ship a background image for F27 upgrades + * Mon Jul 17 2017 Kalev Lember - 3.22.7-2 - Ship a background image for F26 upgrades diff --git a/sources b/sources index bd94e90..4dbfd11 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (gnome-software-3.22.7.tar.xz) = 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825 SHA512 (f26.png) = fdc5407485c5d2a0bf805678a3762543d57bae266c41b8519e89433da1bd925ed8ca136340c936bc4445639a7d0b535c1a020d57eebc0cc3141c8b677ac9ff58 +SHA512 (f27.png) = 083a7ba36f09d0a78d67dcc89dfe1fcab0466a89dd54d837a806c26177dcc6216185693fff63144bb1e406a4353e6b025bd7d7e1373111db364cde50a53d7b32 From c3ba03b47acb0f2a1df50c916238f20ca00d7afe Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 Oct 2017 14:56:01 +0200 Subject: [PATCH 9/9] Fix showing F25->F27 upgrades https://bugzilla.redhat.com/show_bug.cgi?id=1494061 --- ...the-highest-available-distro-upgrade.patch | 34 +++++++++++++++++++ gnome-software.spec | 10 ++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 0001-Show-the-highest-available-distro-upgrade.patch 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..9798814 --- /dev/null +++ b/0001-Show-the-highest-available-distro-upgrade.patch @@ -0,0 +1,34 @@ +From 2218f85e908e8fdea64771d03b0d4fc165b73429 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-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 + diff --git a/gnome-software.spec b/gnome-software.spec index b27b817..0b551e4 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,7 +14,7 @@ Name: gnome-software Version: 3.22.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software center for GNOME License: GPLv2+ @@ -25,6 +25,9 @@ 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 BuildRequires: libxslt @@ -86,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 \ @@ -208,6 +211,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Tue Oct 24 2017 Kalev Lember - 3.22.7-4 +- Fix showing F25->F27 upgrades (#1494061) + * Tue Oct 24 2017 Kalev Lember - 3.22.7-3 - Ship a background image for F27 upgrades