diff --git a/0001-fedora-pkgdb-collections-Incorrect-state-set-on-the-.patch b/0001-fedora-pkgdb-collections-Incorrect-state-set-on-the-.patch deleted file mode 100644 index 88e0522..0000000 --- a/0001-fedora-pkgdb-collections-Incorrect-state-set-on-the-.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cd0743032edccfad47d2253b87daebd01b0ee2e1 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 12 Apr 2024 07:57:14 +0200 -Subject: [PATCH] fedora-pkgdb-collections: Incorrect state set on the upgrade - app - -The "updatable" state means "downloaded locally, ready to be installed", which -is not the case here. The upgrade is either "available" (to be downloaded), or -"unavailable" (end of life). The other states are determined by the other plugins. - -Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2514 ---- - .../gs-plugin-fedora-pkgdb-collections.c | 23 +++---------------- - 1 file changed, 3 insertions(+), 20 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 2983defaa..15d3c385a 100644 ---- a/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c -+++ b/plugins/fedora-pkgdb-collections/gs-plugin-fedora-pkgdb-collections.c -@@ -393,18 +393,10 @@ _create_upgrade_from_info (GsPluginFedoraPkgdbCollections *self, - - /* create */ - app = gs_app_new (app_id); -- switch (item->status) { -- case PKGDB_ITEM_STATUS_ACTIVE: -- case PKGDB_ITEM_STATUS_DEVEL: -- gs_app_set_state (app, GS_APP_STATE_UPDATABLE); -- break; -- case PKGDB_ITEM_STATUS_EOL: -+ if (item->status == PKGDB_ITEM_STATUS_EOL) - gs_app_set_state (app, GS_APP_STATE_UNAVAILABLE); -- break; -- default: -+ else - gs_app_set_state (app, GS_APP_STATE_AVAILABLE); -- break; -- } - gs_app_set_kind (app, AS_COMPONENT_KIND_OPERATING_SYSTEM); - gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_PACKAGE); - gs_app_set_name (app, GS_APP_QUALITY_LOWEST, item->name); -@@ -729,17 +721,8 @@ refine_app (GsPluginFedoraPkgdbCollections *self, - return TRUE; - - /* fix the state */ -- switch (item->status) { -- case PKGDB_ITEM_STATUS_ACTIVE: -- case PKGDB_ITEM_STATUS_DEVEL: -- gs_app_set_state (app, GS_APP_STATE_UPDATABLE); -- break; -- case PKGDB_ITEM_STATUS_EOL: -+ if (item->status == PKGDB_ITEM_STATUS_EOL) - gs_app_set_state (app, GS_APP_STATE_UNAVAILABLE); -- break; -- default: -- break; -- } - - return TRUE; - } --- -2.44.0 - diff --git a/gnome-software.spec b/gnome-software.spec index eeb1db9..e7b85be 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -23,19 +23,14 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$ Name: gnome-software -Version: 46.0 -Release: 2%{?dist} +Version: 46.1 +Release: 1%{?dist} Summary: A software center for GNOME License: GPL-2.0-or-later URL: https://apps.gnome.org/Software Source0: https://download.gnome.org/sources/gnome-software/46/%{name}-%{tarball_version}.tar.xz -# https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2514 -# https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/1949 -# Fix incorrect upgrade state (breaks upgrade process) -Patch: 0001-fedora-pkgdb-collections-Incorrect-state-set-on-the-.patch - # ostree and flatpak not on i686 for RHEL 10 # https://github.com/containers/composefs/pull/229#issuecomment-1838735764 %if 0%{?rhel} >= 10 @@ -269,6 +264,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/gtk-doc/html/gnome-software/ %changelog +* Thu Apr 25 2024 Milan Crha - 46.1-1 +- Update to 46.1 + * Fri Apr 12 2024 Adam Williamson - 46.0-2 - Backport MR #1949 to fix upgrading diff --git a/sources b/sources index 2d68da6..c841edb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-software-46.0.tar.xz) = d221db960bb0a04c8976d20626eb1154a80b12f64f5b4af09ca837814078797e265ab978ae5cad03e3b592f0b9fc41c837d741ef288590b4992fbb4a0fab1d55 +SHA512 (gnome-software-46.1.tar.xz) = 7f851faa706c347a92a10b2a70cef7310cf27fec47bb3d9fc0c832041c9d612ec1fdd029df0a60368eda447047ff9f5afffaacd77669ecefdd4d04827de539ca