From 168d74d29fb443909ee311e0508fe9b94499da17 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sat, 9 Mar 2024 22:42:09 +0100 Subject: [PATCH] Backport patch to fix installing swcatalog Resolves: RHEL-31497 (Backport latest build from Fedora 40) --- appstream.spec | 8 ++++++- ...yle-when-installing-catalog-metadata.patch | 23 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 utils-explicitly-set-format-style-when-installing-catalog-metadata.patch diff --git a/appstream.spec b/appstream.spec index e67f8f8..8910fc3 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,7 +1,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -10,6 +10,8 @@ URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz # upstream patches +# https://github.com/PackageKit/PackageKit/issues/720 +Patch0: utils-explicitly-set-format-style-when-installing-catalog-metadata.patch # upstreamable patches @@ -195,6 +197,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Sat Mar 09 2024 Alessandro Astone - 1.0.2-2 +- Backport patch to fix installing swcatalog +- Resolves: RHEL-31497 (Backport latest build from Fedora 40) + * Sun Feb 25 2024 Neal Gompa - 1.0.2-1 - Update to 1.0.2 - Clean up some pre-1.0 scriptlet cruft diff --git a/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch b/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch new file mode 100644 index 0000000..86f760d --- /dev/null +++ b/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch @@ -0,0 +1,23 @@ +From 36e54f831324c8ad441ef66b49b2149edd752ea9 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Sat, 9 Mar 2024 20:07:32 +0100 +Subject: [PATCH] utils: Explicitly set format style when installing catalog + metadata + +CC: https://github.com/PackageKit/PackageKit/issues/720 +--- + src/as-utils.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/as-utils.c b/src/as-utils.c +index 5efa237f..218f1774 100644 +--- a/src/as-utils.c ++++ b/src/as-utils.c +@@ -2481,6 +2481,7 @@ as_utils_install_metadata_file_internal (const gchar *filename, + if (origin != NULL && !is_yaml) { + g_autoptr(AsMetadata) mdata = as_metadata_new (); + as_metadata_set_locale (mdata, "ALL"); ++ as_metadata_set_format_style (mdata, AS_FORMAT_STYLE_CATALOG); + if (!as_metadata_parse_file (mdata, file_dest, AS_FORMAT_KIND_XML, error)) + return FALSE; + as_metadata_set_origin (mdata, origin);