Resolves: #2272232 (Crash under gs_appstream_gather_merge_data())

The subpackage contains a plugin, which disables itself when the system
is not Fedora, thus is does not need to be distributed elsewhere.

0001-gs-appstream-prefer-swcatalog-over-app-info.patch

@@ -0,0 +1,49 @@
+From 2e9397a64b4e9605b73b759afef78a6bc7738260 Mon Sep 17 00:00:00 2001
+Date: Tue, 19 Nov 2024 10:42:45 +0100
+Subject: [PATCH] gs-appstream: Prefer swcatalog over app-info
+
+When the user upgrades the machine, or when for example PackageKit
+is updated and switches the appstream data installation from
+/var/cache/app-info/ to /var/cache/swcatalog/, then the app-info path
+might not be cleared, causing stale data being saved there, while
+the swcatalog path is properly updated.
+
+Switch the order of the scanned directories, to have precedence the data
+in the swcatalog over the app-info data, if both exist.
+---
+ lib/gs-appstream.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/lib/gs-appstream.c b/lib/gs-appstream.c
+index d20a8340c0..a504c5fd63 100644
+--- a/lib/gs-appstream.c
++++ b/lib/gs-appstream.c
+@@ -2408,11 +2408,6 @@ gs_add_appstream_catalog_location (GPtrArray *locations,
+ 		}
+ 	}
+ 
+-	g_ptr_array_add (locations,
+-			 g_build_filename (catalog_path, "xml", NULL));
+-	g_ptr_array_add (locations,
+-			 g_build_filename (catalog_path, "yaml", NULL));
+-
+ 	if (!ignore_legacy_path) {
+ 		g_ptr_array_add (locations,
+ 				 g_build_filename (catalog_legacy_path, "xml", NULL));
+@@ -2421,6 +2416,13 @@ gs_add_appstream_catalog_location (GPtrArray *locations,
+ 		g_ptr_array_add (locations,
+ 				 g_build_filename (catalog_legacy_path, "yaml", NULL));
+ 	}
++
++	/* Add the current paths _after_ the legacy, that way the data stored in the current
++	   paths has precedence over the (possibly stale) data in the legacy paths. */
++	g_ptr_array_add (locations,
++			 g_build_filename (catalog_path, "xml", NULL));
++	g_ptr_array_add (locations,
++			 g_build_filename (catalog_path, "yaml", NULL));
+ }
+ 
+ GPtrArray *
+-- 
+GitLab
+

gnome-software.spec

@@ -14,6 +14,8 @@
 %bcond malcontent %[!0%{?rhel}]
 # Disable rpm-ostree support for RHEL builds
 %bcond rpmostree %[!0%{?rhel}]
+# Disable fedora-langpacks subpackage for RHEL builds
+%bcond langpacks %[!0%{?rhel}]
 
 # this is not a library version
 %define gs_plugin_version 20
@@ -23,14 +25,17 @@
 %global __provides_exclude_from ^%{_libdir}/%{name}/plugins-%{gs_plugin_version}/.*\\.so.*$
 
 Name:      gnome-software
-Version:   46~beta
-Release:   1%{?dist}
+Version:   46.5
+Release:   3%{?dist}
 Summary:   A software center for GNOME
 
 License:   GPL-2.0-or-later
-URL:       https://wiki.gnome.org/Apps/Software
+URL:       https://apps.gnome.org/Software
 Source0:   https://download.gnome.org/sources/gnome-software/46/%{name}-%{tarball_version}.tar.xz
 
+Patch01:   0001-gs-appstream-prefer-swcatalog-over-app-info.patch
+Patch02:   0002-crash-under-gs_appstream_gather_merge_data.patch
+
 # ostree and flatpak not on i686 for RHEL 10
 # https://github.com/containers/composefs/pull/229#issuecomment-1838735764
 %if 0%{?rhel} >= 10
@@ -90,7 +95,9 @@ Requires: librsvg2%{?_isa}
 Requires: libxmlb%{?_isa} >= %{libxmlb_version}
 
 Recommends: PackageKit%{?_isa} >= %{packagekit_version}
+%if %{with langpacks}
 Recommends: %{name}-fedora-langpacks
+%endif
 
 Obsoletes: gnome-software-snap < 3.33.1
 Obsoletes: gnome-software-editor < 3.35.1
@@ -107,6 +114,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 These development files are for building gnome-software plugins outside
 the source tree. Most users do not need this subpackage installed.
 
+%if %{with langpacks}
 %package fedora-langpacks
 Summary: Contains fedora-langpacks plugin
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -114,6 +122,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description fedora-langpacks
 The fedora-langpacks plugin ensures langpacks packages are installed
 for the current locale.
+%endif
 
 %if %{with rpmostree}
 %package rpm-ostree
@@ -168,6 +177,10 @@ This package includes the rpm-ostree backend.
 # remove unneeded dpkg plugin
 rm %{buildroot}%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so
 
+%if !%{with langpacks}
+rm %{buildroot}%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
+%endif
+
 # make the software center load faster
 desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
     --set-key=X-AppInstall-Package --set-value=%{name}
@@ -246,8 +259,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libexecdir}/gnome-software-cmd
 %{_libexecdir}/gnome-software-restarter
 
+%if %{with langpacks}
 %files fedora-langpacks
 %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
+%endif
 
 %if %{with rpmostree}
 %files rpm-ostree
@@ -264,6 +279,36 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc/html/gnome-software/
 
 %changelog
+* Mon Dec 09 2024 Milan Crha <mcrha@redhat.com> - 46.5-3
+- Resolves: #2272232 (Crash under gs_appstream_gather_merge_data())
+
+* Tue Nov 19 2024 Milan Crha <mcrha@redhat.com> - 46.5-2
+- Added patch to prefer Appstream data in swcatalog over stale data in app-info
+
+* Fri Sep 13 2024 Milan Crha <mcrha@redhat.com> - 46.5-1
+- Update to 46.5
+
+* Fri Aug 02 2024 Milan Crha <mcrha@redhat.com> - 46.4-1
+- Update to 46.4
+
+* Fri Jun 28 2024 Milan Crha <mcrha@redhat.com> - 46.3-1
+- Update to 46.3
+
+* Fri May 24 2024 Milan Crha <mcrha@redhat.com> - 46.2-1
+- Update to 46.2
+
+* Thu Apr 25 2024 Milan Crha <mcrha@redhat.com> - 46.1-1
+- Update to 46.1
+
+* Fri Apr 12 2024 Adam Williamson <awilliam@redhat.com> - 46.0-2
+- Backport MR #1949 to fix upgrading
+
+* Mon Mar 18 2024 Milan Crha <mcrha@redhat.com> - 46.0-1
+- Update to 46.0
+
+* Fri Mar 01 2024 Milan Crha <mcrha@redhat.com> - 46~rc-1
+- Update to 46.rc
+
 * Fri Feb 09 2024 Milan Crha <mcrha@redhat.com> - 46~beta-1
 - Update to 46.beta
 

sources

@@ -1 +1 @@
-SHA512 (gnome-software-46.beta.tar.xz) = 932f6fe10ae9baf233a93abb62ad92a8fced0ce39d77c8ab1ecb3450699fc7491eaa4481968aa585a9dab011e1796a71f5b356eee0e2004ca0f8ace74aae473a
+SHA512 (gnome-software-46.5.tar.xz) = 983d5cf4011d844b0628eaefb3e638c19f28f7794aa323f76ed10085ecbce596d7bce40160af194ae92745174308a85994cd83165e957541cde52ec626659b61