[ltris] Fix and vailidate appdata

commit be1adec2bfc1b6055714dd099f0237e08417e9dd Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Sep 10 19:05:10 2020 +0100 Fix and vailidate appdata .gitignore | 1 + ltris.appdata.xml | 36 ++++++++++++++++++++---------------- ltris.spec | 35 +++++++++++++++++++++++++---------- 3 files changed, 46 insertions(+), 26 deletions(-) --- diff --git a/.gitignore b/.gitignore index d3b0671..facd588 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ltris-1.0.19.tar.gz +/ltris-1.2.1.tar.gz diff --git a/ltris.appdata.xml b/ltris.appdata.xml index beabb33..6b23f93 100644 --- a/ltris.appdata.xml +++ b/ltris.appdata.xml @@ -1,13 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2015 Ankur Sinha <ankursinha AT fedoraproject DOT org> --> - -<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM -BugReportURL: rhbz-# -SentUpstream: yyyy-mm-dd ---> - -<application> - <id type="desktop">ltris.desktop</id> +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> + <id>ltris</id> + <name>ltris</name> <metadata_license>CC0-1.0</metadata_license> <summary>Game of skill with falling blocks</summary> <description> @@ -28,14 +23,23 @@ SentUpstream: yyyy-mm-dd your CPU playing while enjoying a cup of tea! </p> </description> + <launchable type="desktop-id">smplayer.desktop</launchable> <url type="homepage">http://lgames.sourceforge.net/</url> <screenshots> - <screenshot type="default">http://lgames.sourceforge.net/LTris/ss0.jpg&l... - <screenshot type="default">http://lgames.sourceforge.net/LTris/ss1.jpg&l... - <screenshot type="default">http://lgames.sourceforge.net/LTris/ss2.jpg&l... + <screenshot type="default"> + <image>http://lgames.sourceforge.net/LTris/ss0.jpg</image> + </screenshot> + <screenshot> + <image>http://lgames.sourceforge.net/LTris/ss1.jpg</image> + </screenshot> + <screenshot> + <image>http://lgames.sourceforge.net/LTris/ss2.jpg</image> + </screenshot> </screenshots> - <!-- FIXME: change this to an upstream email address for spec updates - <updatecontact&gt;someone_who_cares(a)upstream_project.org&lt;/updatecontact&gt; - --> -</application> + <update_contact>ltris maintainer - kulkanie(a)gmx.net&lt;/update_contact&gt; + <content_rating type="oars-1.1"/> + <releases> + <release version="1.0.19" date="2013-10-29"/> + </releases> +</component> diff --git a/ltris.spec b/ltris.spec index 508ba14..ddfdd76 100644 --- a/ltris.spec +++ b/ltris.spec @@ -1,15 +1,23 @@ Summary: Game of skill with falling blocks Name: ltris Version: 1.0.19 -Release: 10%{?dist} -License: GPL -Group: Amusements/Games +Release: 11%{?dist} +License: GPLv2+ + URL: http://lgames.sourceforge.net/ Source: http://dl.sf.net/lgames/%{name}-%{version}.tar.gz -Patch1: ltris-1.0.19-inlines.patch Source2: %{name}.appdata.xml -Requires: SDL >= 1.1.4, SDL_mixer -BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils, gcc + +Patch0: ltris-1.0.19-inlines.patch + +BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: libappstream-glib +BuildRequires: SDL-devel +BuildRequires: SDL_mixer-devel + +Requires: SDL >= 1.1.4 +Requires: SDL_mixer %description LTris as a tetris clone which means you have a bowl with blocks falling down. @@ -22,8 +30,7 @@ CPU(!) compete and send completed lines to each other. %prep -%setup -%patch1 -p1 +%autosetup -p1 %build @@ -34,7 +41,6 @@ autoreconf -fiv %install %make_install -%find_lang %{name} %{__mkdir_p} %{buildroot}%{_datadir}/applications desktop-file-install \ @@ -43,9 +49,13 @@ desktop-file-install \ install -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml + +%find_lang %{name} %files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS ChangeLog README TODO +%license COPYING %attr(2551, root, games) %{_bindir}/ltris %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/ltris48.gif @@ -55,6 +65,11 @@ install -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml %changelog +* Thu Sep 10 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.0.19-11 +- Fix and vailidate appdata +- Fix licence +- Update spec file + * Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.0.19-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild