diff --git a/0001-as-app-Also-unwrap-description-in-metainfo-files.patch b/0001-as-app-Also-unwrap-description-in-metainfo-files.patch deleted file mode 100644 index d8254d7..0000000 --- a/0001-as-app-Also-unwrap-description-in-metainfo-files.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 004a4e60e2433c404e7c36b94770c94e592db0fc Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 8 Feb 2022 15:50:40 +0100 -Subject: [PATCH] as-app: Also unwrap description in metainfo files - -According to the specification, there is no difference between both kinds -of upstream metainfo files. - -Fixes #381 ---- - libappstream-glib/as-app.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libappstream-glib/as-app.c b/libappstream-glib/as-app.c -index b65f08d..76c0727 100644 ---- a/libappstream-glib/as-app.c -+++ b/libappstream-glib/as-app.c -@@ -4972,8 +4972,11 @@ as_app_node_parse_child (AsApp *app, GNode *n, guint32 flags, - /* */ - case AS_TAG_DESCRIPTION: - { -- /* unwrap appdata inline */ -+ /* unwrap appdata and metainfo inline */ - AsFormat *format = as_app_get_format_by_kind (app, AS_FORMAT_KIND_APPDATA); -+ if (format == NULL) -+ format = as_app_get_format_by_kind (app, AS_FORMAT_KIND_METAINFO); -+ - if (format != NULL) { - GError *error_local = NULL; - g_autoptr(GHashTable) unwrapped = NULL; --- -2.34.1 - diff --git a/_service b/_service index 799e3b0..b8a04e4 100644 --- a/_service +++ b/_service @@ -2,11 +2,14 @@ https://github.com/hughsie/appstream-glib.git git - @PARENT_TAG@ + @PARENT_TAG@+@TAG_OFFSET@ appstream_glib_(\d+)_(\d+)_(\d+) \1.\2.\3 enable + 004a4e60e2433c404e7c36b94770c94e592db0fc + diff --git a/_servicedata b/_servicedata index 37266a2..19a796a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/hughsie/appstream-glib.git - 705e8e2061e9c9ef741792b1de56c6529fb57082 \ No newline at end of file + 004a4e60e2433c404e7c36b94770c94e592db0fc \ No newline at end of file diff --git a/appstream-glib-0.7.18+28.obscpio b/appstream-glib-0.7.18+28.obscpio new file mode 100644 index 0000000..6b38b7f --- /dev/null +++ b/appstream-glib-0.7.18+28.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f47ae26d272c7d3bc11a50b46b415bf091e0376edfeb2a65f8966a34a67c18a4 +size 5167117 diff --git a/appstream-glib-0.7.18.obscpio b/appstream-glib-0.7.18.obscpio deleted file mode 100644 index 42a8ee7..0000000 --- a/appstream-glib-0.7.18.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:081f9c5a2435c50833a1f246191894515f4d335e392c0c416f4538406c12f96c -size 5147661 diff --git a/appstream-glib.changes b/appstream-glib.changes index 33c7dff..0cfe5cb 100644 --- a/appstream-glib.changes +++ b/appstream-glib.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue Feb 08 15:58:58 UTC 2022 - bjorn.lie@gmail.com + +- Update to version 0.7.18+28: + * as-app: Also unwrap description in metainfo files + * Fix validation of translated captions when LANG is not C + * Revert "Don't emit legacy component type values" + * Don't emit legacy component type values + * its: Sync with appstream + * Consider AppStream version as a string + * meson: Check --version-script linker option before using. + * Update current newest version in AsStore + * Support em/code tags Some appstream-data packages add and + or and to the files. Not all package + manager can handle that. An example would be pamac from Manjaro + * Update asb-self-test to match current behavior + * Add validation for duplicate license xml elements + * builder: make directories as 0755 && umask + * Do not show a critical warning on + * libappstream-builder: Fix paths for cached icons + * as-util: Fix Markdown underlining in appdata-to-news + * Replace links http://standards.freedesktop.org/... by https in + README.md + * Replace a link http://www.freedesktop.org/wiki/... by https in + README.md + * as-app: Parse launchables from DEP-11 + * as-app: Parse custom tags from DEP-11 + * as-content-rating: Align the OARS/CSM mappings of sex-* + * Updated translations. +- Switch to current git head, upstream is not making releases. +- Drop 0001-as-app-Also-unwrap-description-in-metainfo-files.patch: + Fixed upstream. + ------------------------------------------------------------------- Tue Feb 8 15:25:24 UTC 2022 - Fabian Vogt diff --git a/appstream-glib.obsinfo b/appstream-glib.obsinfo index 9967243..837d941 100644 --- a/appstream-glib.obsinfo +++ b/appstream-glib.obsinfo @@ -1,5 +1,4 @@ name: appstream-glib -version: 0.7.18 -mtime: 1599473586 -commit: 705e8e2061e9c9ef741792b1de56c6529fb57082 - +version: 0.7.18+28 +mtime: 1644332535 +commit: 004a4e60e2433c404e7c36b94770c94e592db0fc diff --git a/appstream-glib.spec b/appstream-glib.spec index b75bc51..a9abf55 100644 --- a/appstream-glib.spec +++ b/appstream-glib.spec @@ -18,15 +18,14 @@ Name: appstream-glib -Version: 0.7.18 +Version: 0.7.18+28 Release: 0 Summary: AppStream Abstraction Library License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://people.freedesktop.org/~hughsient/appstream-glib/ Source0: %{name}-%{version}.tar.xz Source1: openSUSE-appstream-process -# PATCH-FIX-UPSTREAM -Patch1: 0001-as-app-Also-unwrap-description-in-metainfo-files.patch + BuildRequires: docbook-xsl-stylesheets BuildRequires: gcab >= 0.6 BuildRequires: gobject-introspection-devel