rpms/evince
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validate appdata file in %check and fix the validation to pass

Browse Source 
This ensures that we fail early, instead of failing during the flatpak
building that checks that the appdata files are valid.

https://gitlab.gnome.org/GNOME/evince/merge_requests/197
This commit is contained in:
Kalev Lember 2019-10-28 18:58:48 +01:00
parent 427db1c61f
commit 99a7eb4fbe
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
evince-appdata-validate-patch Normal file
View File

@ -0,0 +1,27 @@
From df320fd57d9dae6a4600ddcd795809e495c7ae6b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mon, 28 Oct 2019 20:03:55 +0100
Subject: [PATCH] AppData: Fix validation error
Remove the 3.30.3 release from the appdata file to make 'appstream-util
validate-relax' not error out on the release tag order.
tag-invalid : <release> versions are not in order [3.30.3 before 3.32.0]
---
org.gnome.Evince.appdata.xml.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/org.gnome.Evince.appdata.xml.in b/org.gnome.Evince.appdata.xml.in
index 5f19b3d5..c5aa8989 100644
--- a/org.gnome.Evince.appdata.xml.in
+++ b/org.gnome.Evince.appdata.xml.in
@@ -110,6 +110,5 @@
</release>
<release version="3.32.1" date="2019-09-29" />
<release version="3.32.0" date="2019-03-14" />
- <release version="3.30.3" date="2019-09-29" />
</releases>
</component>
--
2.23.0

3
evince.spec
View File

@ -15,6 +15,8 @@ Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{versio
# https://bugzilla.gnome.org/show_bug.cgi?id=766749 # https://bugzilla.gnome.org/show_bug.cgi?id=766749
Patch0: 0001-Resolves-deb-762530-rhbz-1061177-add-man-pages.patch Patch0: 0001-Resolves-deb-762530-rhbz-1061177-add-man-pages.patch
# https://gitlab.gnome.org/GNOME/evince/merge_requests/197
Patch1: evince-appdata-validate-patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1753830 # https://bugzilla.redhat.com/show_bug.cgi?id=1753830
Patch1: evince-text-drag.patch Patch1: evince-text-drag.patch
@ -173,6 +175,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%check %check
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Evince.appdata.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-previewer.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-previewer.desktop