From 34a6a0b12bc05d858b51b44d97bce533f2e968a2 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 11 Feb 2021 17:07:22 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/appstream.git#f30c01c3872a72dec2484148e04b64f232edb97e --- .gitignore | 3 +++ appstream.spec | 11 +++++++---- sources | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c6bba74..7412c83 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ /AppStream-0.12.10.tar.xz /AppStream-0.12.11.tar.xz /AppStream-0.13.1.tar.xz +/AppStream-0.14.0.tar.xz +/0016-Do-not-automatically-clean-up-errors-that-will-be-pr.patch +/0025-Remove-overall-extern-C-to-make-very-new-2.67-GLib-v.patch diff --git a/appstream.spec b/appstream.spec index 3348050..56c86da 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,8 +4,8 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.13.1 -Release: 2%{?dist} +Version: 0.14.0 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -14,6 +14,8 @@ URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz ## upstream patches (lookaside cache) +Patch16: 0016-Do-not-automatically-clean-up-errors-that-will-be-pr.patch +Patch25: 0025-Remove-overall-extern-C-to-make-very-new-2.67-GLib-v.patch ## upstreamable patches @@ -71,8 +73,6 @@ Requires: pkgconfig(Qt5Core) %prep %autosetup -n AppStream-%{version} -p1 -sed -i -e "s|0.12.2|%{version}|" meson.build - %build %{meson} \ @@ -172,6 +172,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Thu Feb 04 2021 Rex Dieter - 0.14.0-1 +- 0.14.0 + * Tue Jan 26 2021 Fedora Release Engineering - 0.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index cc5cf28..2bf8c67 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (AppStream-0.13.1.tar.xz) = 9cf469bf604bbdd63815a4b824f13555eb7a9465dbed9f67b41ee1c2704454efa80f7653733dd23d7f7ce759531b826f821b58a606591e57bc86fe03d7a94a9f +SHA512 (AppStream-0.14.0.tar.xz) = d02d5201b8513063f041ddbafa212c8e6d9ee6d22299750d1f0074fd9a7d61a825dab6e169ccc7de0273fb9a26284d3ed8d7485862c2839eccb24688f4b771b2 +SHA512 (0016-Do-not-automatically-clean-up-errors-that-will-be-pr.patch) = 19aed24fb3edc6d8ea015e2a398fa965e1fa87800942d7c9c1d5e3c4e362d163b320565b7b0cd1d886e4516b154a3de724f22b8ffdfb80d4bb160505b84dc689 +SHA512 (0025-Remove-overall-extern-C-to-make-very-new-2.67-GLib-v.patch) = be51bcbe19b273c1d28048278f0cab56535a0fcfbc6c670d91e6c13c267c2e833be10f811ec5beab427b5a78fe45579107469f0f207db489677c500932ff55bb