1:13 p.m.
commit 955801bb27b83745d12966f1b85746a775342799
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Mar 18 14:13:25 2017 +0100
Update to 17.03.17
Add appdata.xml file
Add BR libappstream-glib
.gitignore | 1 +
fix_QMPlay2-appdata-xml.patch | 19 +++++++++++++++++++
qmplay2.spec | 19 +++++++++++++++++--
sources | 2 +-
4 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 608eb7b..50d4e66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/QMPlay2-src-16.11.20.tar.xz
/QMPlay2-src-16.12.23.tar.xz
/QMPlay2-src-17.02.12.tar.xz
+/QMPlay2-src-17.03.17.tar.xz
diff --git a/fix_QMPlay2-appdata-xml.patch b/fix_QMPlay2-appdata-xml.patch
new file mode 100644
index 0000000..aa2f0b2
--- /dev/null
+++ b/fix_QMPlay2-appdata-xml.patch
@@ -0,0 +1,19 @@
+--- QMPlay2-src-17.03.17.orig/src/gui/Unix/QMPlay2.appdata.xml.in 2017-03-11
01:19:26.000000000 +0100
++++ QMPlay2-src-17.03.17/src/gui/Unix/QMPlay2.appdata.xml.in 2017-03-18
12:14:45.091071846 +0100
+@@ -1,6 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <component type="desktop-application">
+- <id>org.zaps166.QMPlay2</id>
++ <id>QMPlay2.desktop</id>
++ <metadata_license>CC0-1.0</metadata_license>
+ <name>QMPlay2</name>
+ <summary>Video and audio player</summary>
+ <description>
+@@ -11,7 +12,6 @@
+ </description>
+ <url
type="homepage">http://zaps166.sourceforge.net/?app=QMPlay2&...
+ <url
type="bugtracker">https://github.com/zaps166/QMPlay2/issues&...
+- <icon type="stock">QMPlay2</icon>
+ <categories>
+ <category>AudioVideo</category>
+ <category>Player</category>
diff --git a/qmplay2.spec b/qmplay2.spec
index 9d2833c..838aed1 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -1,17 +1,21 @@
%global pname QMPlay2
Name: qmplay2
-Version: 17.02.12
+Version: 17.03.17
Release: 1%{?dist}
Summary: A Qt based media player, streamer and downloader
License: LGPLv3+
Url: http://zaps166.sourceforge.net/?app=QMPlay2
Source:
https://github.com/zaps166/QMPlay2/releases/download/%{version}/%{pname}-...
+# https://github.com/zaps166/QMPlay2/issues/92
+Patch0: fix_QMPlay2-appdata-xml.patch
BuildRequires: kde-workspace-devel
BuildRequires: pkgconfig(Qt5)
BuildRequires: qt5-linguist
BuildRequires: portaudio-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libavcodec)
@@ -53,7 +57,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
It's a development package for %{name}.
%prep
-%autosetup -n %{pname}-src-%{version}
+%autosetup -p1 -n %{pname}-src-%{version}
# E: invalid-desktopfile /usr/share/applications/QMPlay2.desktop file
# contains group "PlayPause Shortcut Group", but groups extending the
@@ -81,8 +85,13 @@ s:.*/\([a-zA-Z]\{2\}\).qm:%lang(\1) \0:' > %{name}.lang
cd %{buildroot}/%{_datadir}/qmplay2
rm LICENSE README.md TODO AUTHORS ChangeLog
+mkdir -p %{buildroot}%{_datadir}/appdata
+mv %{buildroot}/%{_datadir}/metainfo/org.zaps166.QMPlay2.appdata.xml \
+ %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
%post
/sbin/ldconfig
@@ -113,6 +122,7 @@ fi
%dir %{_datadir}/solid
%dir %{_datadir}/solid/actions
%{_datadir}/applications/%{pname}*.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/icons/hicolor/*/apps/%{pname}.png
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/lang
@@ -125,6 +135,11 @@ fi
%{_includedir}/%{pname}
%changelog
+* Sat Mar 18 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.03.17-1
+- Update to 17.03.17
+- Add appdata.xml file
+- Add BR libappstream-glib
+
* Mon Feb 13 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.02.12-1
- Update to 17.02.12
diff --git a/sources b/sources
index 906b26b..7fef336 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-631b3332ddec18cd103771ec719213c1 QMPlay2-src-17.02.12.tar.xz
+71692fc73a3b2c6285d8a498c0f9d53d QMPlay2-src-17.03.17.tar.xz