diff --git a/0001-Fix-lib-name-for-Qt5-link-target.patch b/0001-Fix-lib-name-for-Qt5-link-target.patch deleted file mode 100644 index 5fc489a..0000000 --- a/0001-Fix-lib-name-for-Qt5-link-target.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fed92f2a5420b3f2609007a44be7251e9602459e Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Sun, 12 Nov 2023 13:07:13 +0100 -Subject: [PATCH] Fix lib name for Qt5 link target - ---- - qt/cmake/AppStreamQt5Config.cmake.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qt/cmake/AppStreamQt5Config.cmake.in b/qt/cmake/AppStreamQt5Config.cmake.in -index 0bef7e80..1d66c566 100644 ---- a/qt/cmake/AppStreamQt5Config.cmake.in -+++ b/qt/cmake/AppStreamQt5Config.cmake.in -@@ -32,8 +32,8 @@ add_library(AppStreamQt SHARED IMPORTED) - set_target_properties(AppStreamQt PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/" - INTERFACE_LINK_LIBRARIES "Qt5::Core" -- IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt_VERSION}" -- IMPORTED_SONAME "libAppStreamQt5.${AppStreamQt_VERSION_MAJOR}" -+ IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt5_VERSION}" -+ IMPORTED_SONAME "libAppStreamQt5.${AppStreamQt5_VERSION_MAJOR}" - ) - - #################################################################################### --- -2.43.0 - diff --git a/0001-content-rating-Fix-missing-or-wrong-value-descriptio.patch b/0001-content-rating-Fix-missing-or-wrong-value-descriptio.patch deleted file mode 100644 index 7fda496..0000000 --- a/0001-content-rating-Fix-missing-or-wrong-value-descriptio.patch +++ /dev/null @@ -1,79 +0,0 @@ -From e747fb81715505fc6cf6a6cc36a6dcede34aafb3 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Mon, 27 Nov 2023 15:59:08 +0100 -Subject: [PATCH] content-rating: Fix missing or wrong value descriptions for - rating IDs - -Resolves: #563 ---- - src/as-content-rating.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/src/as-content-rating.c b/src/as-content-rating.c -index 5046f79d..9fd832ba 100644 ---- a/src/as-content-rating.c -+++ b/src/as-content-rating.c -@@ -877,10 +877,10 @@ static const struct { - "violence-sexual", - /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ - N_("No sexual violence"), -- /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -- N_("Rape or other violent sexual behavior"), - NULL, - NULL, -+ /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -+ N_("Rape or other violent sexual behavior"), - }, - { - "drugs-alcohol", -@@ -920,7 +920,8 @@ static const struct { - N_("Brief artistic nudity"), - /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ - N_("Prolonged nudity"), -- NULL, -+ /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -+ N_("Explicit nudity involving visible sexual organs"), - }, - { - "sex-themes", -@@ -1013,19 +1014,20 @@ static const struct { - "social-audio", - /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ - N_("No way to talk with other users"), -+ NULL, -+ /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -+ N_("Moderated audio or video chat functionality between users"), - /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ - N_("Uncontrolled audio or video chat functionality between users"), -- NULL, -- NULL, - }, - { - "social-contacts", - /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ - N_("No sharing of social network usernames or email addresses"), -- /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -- N_("Sharing social network usernames or email addresses"), - NULL, - NULL, -+ /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -+ N_("Sharing social network usernames or email addresses"), - }, - { - "social-info", -@@ -1042,10 +1044,10 @@ static const struct { - "social-location", - /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ - N_("No sharing of physical location with other users"), -- /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -- N_("Sharing physical location with other users"), - NULL, - NULL, -+ /* TRANSLATORS: content rating description, see https://hughsie.github.io/oars/ */ -+ N_("Sharing physical location with other users"), - }, - - /* v1.1 */ --- -2.43.0 - diff --git a/0001-validator-Demote-developer-name-tag-deprecated-to-in.patch b/0001-validator-Demote-developer-name-tag-deprecated-to-in.patch deleted file mode 100644 index bc5e839..0000000 --- a/0001-validator-Demote-developer-name-tag-deprecated-to-in.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6a8306178dabf3d650e2ad794d8b0a316e7ccb50 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Sat, 25 Nov 2023 02:42:10 +0100 -Subject: [PATCH] validator: Demote developer-name-tag-deprecated to info - severity for now - -Resolves: #560 ---- - src/as-validator-issue-tag.h | 2 +- - src/as-validator.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/as-validator-issue-tag.h b/src/as-validator-issue-tag.h -index 48f0bec..3c40c01 100644 ---- a/src/as-validator-issue-tag.h -+++ b/src/as-validator-issue-tag.h -@@ -566,7 +566,7 @@ AsValidatorIssueTag as_validator_issue_tag_list[] = { - }, - - { "developer-name-tag-deprecated", -- AS_ISSUE_SEVERITY_WARNING, -+ AS_ISSUE_SEVERITY_INFO, - /* TRANSLATORS: Please do not translate AppStream tag and property names (in backticks). */ - N_("The toplevel `developer_name` element is deprecated. Please use the `name` element in a " - "`developer` block instead."), -diff --git a/src/as-validator.c b/src/as-validator.c -index 1c3bc8f..dadb51e 100644 ---- a/src/as-validator.c -+++ b/src/as-validator.c -@@ -645,6 +645,8 @@ as_validator_add_override (AsValidator *validator, - "tag-empty", - /* allow GNOME to validate metadata using its new versioning scheme (until a better solution is found) */ - "releases-not-in-order", -+ /* allowed for a while, as part of the deprecation phase */ -+ "developer-name-tag-deprecated", - NULL - }; - --- -2.43.0 - diff --git a/AppStream-1.0.0.tar.xz b/AppStream-1.0.0.tar.xz deleted file mode 100644 index ea7ccb1..0000000 --- a/AppStream-1.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef23477a380e8b525e92cfa87687f1146b9cef74c641349a1ae11250be5401d0 -size 2683916 diff --git a/AppStream-1.0.0.tar.xz.asc b/AppStream-1.0.0.tar.xz.asc deleted file mode 100644 index e0a4b20..0000000 --- a/AppStream-1.0.0.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmVPzIYACgkQSUyKX79N -7Ov/Ng//YSZb/6TmVJQIoiulT8rFUlAmWgYVRzdPvbxLvvFmxV5SODkJ2jlOWUGz -tv38vU2Wl0vTxYoNMIOWuZo+sUk8IUw/02KfPVlllXqlyuXDW/Kgaww2HKifJhm1 -tEgxZ53CoNVP+GgOWhhN8IzBWFCbczHeOgsT1GsbJQuGP3HXBRx6oBzMkild6TxT -7WEnTTAndQ0+pyCvM6hR1W982fz2PFeK1JcrXVEbzlPLTBCx8LCy2IWOT9aNv+mC -HXXfrCRaA9SDK1egxTHupIR3u36YudE7x+IitAs9P6x18QvWFZrK4Sj/mZz0HcK9 -HrLDcb0zDne904ZN80Qojqb8Rn3bVYh31F1Wf6C9p5HrvGM7+onVj8KT/k7nDq11 -xSE202mQEhPZHwwoNTiJ9DDDK853vDaeqqsNh8190MqIsau4O3VelODV7ot825hA -URUiYc+lhYM67UKv8RdEQ1lP0F0MPH9vyeQUIjpnWLf6lZA5wCRv5G7wRq3YPAUp -muX/t6B5FJ6PW6THqIBqwxDInqgqPPVMHQh3WJzyfj2W3o8CN/tWRyjK9G025XqD -CxRwQ7UMeW5Pb7Trn/Y1oPWQZqywQ6njawAOdGCzdt+PGLzkMoEOdY/8GL6atCCA -l5FTk/8crtYUZTOEUSaArFTg5JQzafjElefXHkZU4DAkmeshlPE= -=Fujg ------END PGP SIGNATURE----- diff --git a/AppStream-1.0.1.tar.xz b/AppStream-1.0.1.tar.xz new file mode 100644 index 0000000..cfa0ea3 --- /dev/null +++ b/AppStream-1.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa4d5994e5c6f22e9b66cb0b52e8b5f5d96e7353ea5528b56436e0150829203b +size 2686244 diff --git a/AppStream-1.0.1.tar.xz.asc b/AppStream-1.0.1.tar.xz.asc new file mode 100644 index 0000000..9b6b071 --- /dev/null +++ b/AppStream-1.0.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE0zo/DKFrCsxRpgc4SUyKX79N7OsFAmV93JEACgkQSUyKX79N +7OtiSRAAlWPrsQLdYvwPA9I1NPTlpKYM4JiGyB9U78E/lzGcrCz/VbMrIQr0Okkb +nzHGt0KmtaNu99h0Awd8mHsRz4bNI44x66p4HFQUN/XouE9CJOJZb426at/NopfZ +sJn4+Bq1lKZuNT5lgSQjQFsBFSBroAqzXBiRhKrhy/Cdo39nPtTN7L1fkLLMhsce +IOCGRQGcLwYWBYJ9FL+fy894+tNG1lm3x2B0sbbeBf30MRfKvHTu364mlcs9bnp0 +k8kC266Sjz5k5bqJRUL38zncHisN9HUXZj9G/t0n1ee59IkAepIeLETxU6vHW1YE +FY9iLD3+U4YYhWTrmhH4t/TysixN1CLQyDIsuRjqnYPGd08rujE8L7o0N2/LzTE8 +TleNIs14dljWrHeSylEi7I4MFiK0A3eDt23xqsmGl2qQ8W8VxItKv1uN9JKLOmJ3 +mAv4mDmQtaTM/8UlgSUTtZChUfydYnAJSKKmyRBEmqKPBZK6XHGrId5Uy8KjyOjM +9g/4HUqLBTSmdErxeOAy8VhVkwApuPjFq0o1/+/doGoEFHITx+pqzTrKHXilJyOQ +mySumufZ+jpBXmVDhcMR43pgy7ejobaqK1wAOvx3/VDTmIt2ax9XUpKwTAqAAdSN +UbT34aXemxKzcWTXNHXrY+OK4w6KjPSvacr63wypYJRlnNobpZ0= +=/u+K +-----END PGP SIGNATURE----- diff --git a/AppStream.changes b/AppStream.changes index 50a0770..bd41230 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Feb 1 09:04:42 UTC 2024 - Christophe Marin + +- Update to 1.0.1 + Bugfixes: + * Fix lib name for Qt5 link target + * meson: Pass -D_DARWIN_C_SOURCE on darwin + * Fix macOS build + * stemmer: Resolve potential issue where stemmer may never be + initialized + * cli: Don't fail what-provides if components were found + * Fix query element order for what-provides queries + * validator: Demote developer-name-tag-deprecated to info + severity for now + * content-rating: Fix missing or wrong value descriptions for + rating IDs + * curl: Add transfer speed timeouts for HTTP downloads + * curl: Retry operations on potentially transient errors + Miscellaneous: + * validator: Improve hint for content-attribute-value-invalid + * Allow building without zstd temporarily +- Drop patches, merged upstream: + * 0001-validator-Demote-developer-name-tag-deprecated-to-in.patch + * 0001-content-rating-Fix-missing-or-wrong-value-descriptio.patch + * 0001-content-rating-Fix-missing-or-wrong-value-descriptio.patch + ------------------------------------------------------------------- Wed Jan 31 14:34:55 UTC 2024 - Christophe Marin diff --git a/AppStream.keyring b/AppStream.keyring index 7e82dee..2ca1dc3 100644 Binary files a/AppStream.keyring and b/AppStream.keyring differ diff --git a/AppStream.spec b/AppStream.spec index 149e7e7..b11426b 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -35,7 +35,7 @@ %define libAppStreamQt_sover 3 %define libappstream_compose_sover 0 Name: AppStream%{?pkg_suffix} -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: Tools and libraries to work with AppStream metadata License: LGPL-2.1-or-later @@ -45,10 +45,6 @@ Source1: http://www.freedesktop.org/software/appstream/releases/%{rname}- Source2: AppStream.keyring # PATCH-FIX-OPENSUSE Patch0: support-meson0.59.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-validator-Demote-developer-name-tag-deprecated-to-in.patch -Patch2: 0001-content-rating-Fix-missing-or-wrong-value-descriptio.patch -Patch3: 0001-Fix-lib-name-for-Qt5-link-target.patch BuildRequires: cairo-devel BuildRequires: docbook-xsl-stylesheets %if %{with gcc13}