PR#1: Use AppStream metadata from upstream - rpms/flacon

rpms / flacon

#1 Use AppStream metadata from upstream

Closed 2 years ago by vascom. Opened 2 years ago by siosm.

rpms/ siosm/flacon appstream into rawhide

Use AppStream metadata from upstream

Timothée Ravier • 2 years ago

2555b4a

0001-misc-metainfo-Set-XML-version-and-encoding.patch

file added

+31

		`@@ -0,0 +1,31 @@`
		`+ From ad2ac393c46280715c2f2407d25dcf7cd8114571 Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>`
		`+ Date: Tue, 8 Feb 2022 17:57:48 +0100`
		`+ Subject: [PATCH 1/2] misc/metainfo: Set XML version and encoding`
		`+ MIME-Version: 1.0`
		`+ Content-Type: text/plain; charset=UTF-8`
		`+ Content-Transfer-Encoding: 8bit`
		`+`
		`+ Fixes:`
		+ ```
		`+ $ appstream-util validate-relax --nonet misc/com.github.Flacon.metainfo.xml.in`
		`+ misc/com.github.Flacon.metainfo.xml.in: FAILED:`
		`+ • markup-invalid : <?xml> header not found`
		`+ Validation of files failed`
		+ ```
		`+ ---`
		`+ misc/com.github.Flacon.metainfo.xml.in \| 1 +`
		`+ 1 file changed, 1 insertion(+)`
		`+`
		`+ diff --git a/misc/com.github.Flacon.metainfo.xml.in b/misc/com.github.Flacon.metainfo.xml.in`
		`+ index 29f74f6..73c51b7 100644`
		`+ --- a/misc/com.github.Flacon.metainfo.xml.in`
		`+ +++ b/misc/com.github.Flacon.metainfo.xml.in`
		`+ @@ -1,3 +1,4 @@`
		`+ +<?xml version="1.0" encoding="UTF-8"?>`
		`+ <component type="desktop-application">`
		`+ <id>com.github.Flacon</id>`
		`+ <name>Flacon</name>`
		`+ --`
		`+ 2.34.1`
		`+`

0002-misc-metainfo-Add-missing-new-line-at-EOF.patch

file added

+23

		`@@ -0,0 +1,23 @@`
		`+ From 0d03f03ea43cf07a337f1bfbb04bacf0ace7f2ab Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>`
		`+ Date: Tue, 8 Feb 2022 17:58:40 +0100`
		`+ Subject: [PATCH 2/2] misc/metainfo: Add missing new line at EOF`
		`+`
		`+ ---`
		`+ misc/com.github.Flacon.metainfo.xml.in \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/misc/com.github.Flacon.metainfo.xml.in b/misc/com.github.Flacon.metainfo.xml.in`
		`+ index 73c51b7..f1af52c 100644`
		`+ --- a/misc/com.github.Flacon.metainfo.xml.in`
		`+ +++ b/misc/com.github.Flacon.metainfo.xml.in`
		`+ @@ -71,4 +71,4 @@`
		`+`
		`+ <content_rating type="oars-1.1">`
		`+ </content_rating>`
		`+ -</component>`
		`+ \ No newline at end of file`
		`+ +</component>`
		`+ --`
		`+ 2.34.1`
		`+`

flacon.appdata.xml

file removed

-44

		`@@ -1,44 +0,0 @@`
		`- <?xml version="1.0" encoding="UTF-8"?>`
		`- <!-- Copyright 2016 Ilya Gradina <ilya.gradina@gmail.com> -->`
		`- <application>`
		`- <id type="desktop">flacon.desktop</id>`
		`- <metadata_license>CC0-1.0</metadata_license>`
		`- <project_license>LGPL-2.1</project_license>`
		`- <name>Flacon</name>`
		`- <summary>A tool to extract individual tracks from one big audio file using CUE</summary>`
		`- <description>`
		`- <p>Flacon extracts individual tracks from one big audio file`
		`- containing the entire album of music and saves them as`
		`- separate audio files. To do this, it uses information from`
		`- the appropriate CUE file.</p>`
		`- <p>Besides that, Flacon makes it possible to conveniently`
		`- revise or specify tags both for all tracks at once or for each tag separately.</p>`
		`- <p>Features:</p>`
		`- <ul>`
		`- <li>Supported input formats: WAV, FLAC, APE, WavPack, True Audio (TTA)</li>`
		`- <li>Supported out formats: FLAC, WAV, WavPack, AAC, OGG or MP3</li>`
		`- <li>Replay Gain analysis (album-gain and track-gain modes)</li>`
		`- <li>Multi-threaded conversion process</li>`
		`- <li>Automatic character set detection for CUE files</li>`
		`- <li>Generation of the pertrack CUE file in the output dir</li>`
		`- </ul>`
		`- </description>`
		`- <keywords>`
		`- <keyword>track</keyword>`
		`- <keyword>cue</keyword>`
		`- <keyword>flac</keyword>`
		`- <keyword>wav</keyword>`
		`- <keyword>ape</keyword>`
		`- </keywords>`
		`- <urls>`
		`- <url type="homepage">https://flacon.github.io/</url>`
		`- <url type="donation">https://flacon.github.io/donate/</url>`
		`- <url type="translate">https://www.transifex.com/sokoloff/flacon/</url>`
		`- </urls>`
		`- <screenshots>`
		`- <screenshot type="default">https://github.com/ilgrad/fedora-packages/raw/master/flacon/flacon1.png</screenshot>`
		`- <screenshot>https://github.com/ilgrad/fedora-packages/raw/master/flacon/flacon2.png</screenshot>`
		`- <screenshot>https://github.com/ilgrad/fedora-packages/raw/master/flacon/flacon3.png</screenshot>`
		`- </screenshots>`
		`- <updatecontact>ilya.gradina@gmail.com</updatecontact>`
		`- </application>`

flacon.spec

file modified

+8 -7

		`@@ -9,7 +9,8 @@`
		`License: LGPLv2+`
		`URL: https://flacon.github.io/`
		`Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz`
		`- Source1: %{name}.appdata.xml`
		`+ Patch1: 0001-misc-metainfo-Set-XML-version-and-encoding.patch`
		`+ Patch2: 0002-misc-metainfo-Add-missing-new-line-at-EOF.patch`

		`BuildRequires: cmake`
		`BuildRequires: gcc-c++`
		`@@ -66,7 +67,7 @@`
		`tags both for all tracks at once or for each tag separately.`

		`%prep`
		`- %autosetup`
		`+ %autosetup -p1`

		`%build`
		`%cmake -DBUILD_TESTS=%{?with_tests:Yes}%{!?with_tests:No}`
		`@@ -74,13 +75,10 @@`

		`%install`
		`%cmake_install`
		`- mkdir -p %{buildroot}%{_datadir}/appdata`
		`- cp -a %{SOURCE1} %{buildroot}%{_datadir}/appdata`
		`- rm -r %{buildroot}%{_datadir}/metainfo`
		`%find_lang %{name} --with-qt`

		`%check`
		`- appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml`
		`+ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/com.github.Flacon.metainfo.xml`
		`desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop`
		`%if %{with tests}`
		`cd %{_target_platform}/tests && ./flacon_test`
		`@@ -92,12 +90,15 @@`
		`%{_bindir}/%{name}`
		`%dir %{_datadir}/%{name}`
		`%dir %{_datadir}/%{name}/translations`
		`- %{_datadir}/appdata/%{name}.appdata.xml`
		`+ %{_datadir}/metainfo/com.github.Flacon.metainfo.xml`
		`%{_datadir}/applications/%{name}.desktop`
		`%{_datadir}/icons/hicolor//apps/%{name}.`
		`%{_mandir}/man1/%{name}.1*`

		`%changelog`
		`+ * Tue Feb 08 2022 Timothée Ravier <tim@siosm.fr> - 8.3.0-2`
		`+ - Use AppStream metadata from upstream`
		`+`
		`* Fri Feb 04 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 8.3.0-1`
		`- Update to 8.3.0`