[rpms/amarok] epel10.2: pull in upstream (master/ branch) appdata

[rpms/amarok] epel10.2: pull in upstream (master/ branch) appdata

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 9d2b677aa4d1bd76e1880dc5f467ad27fadcb5bc
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2014-11-07T15:06:53-06:00
Stats  : +73/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/9d2b677aa4d1bd76e1880dc5f467ad27fadcb5bc?branch=epel10.2

Log:
pull in upstream (master/ branch) appdata

---
diff --git a/Add_AppStream_metadata_for_Amarok.patch b/Add_AppStream_metadata_for_Amarok.patch
new file mode 100644
index 0000000..24fa6cd
--- /dev/null
+++ b/Add_AppStream_metadata_for_Amarok.patch
@@ -0,0 +1,61 @@
+commit 4b3eaaced5bf250ccae0fd558a196cc9a3d6c620
+Author: Matthias Klumpp <matthias@tenstral.net>
+Date:   Tue Aug 12 03:28:48 2014 +0200
+
+    Add AppStream metadata for Amarok
+    
+    See http://lists.kde.org/?l=kde-core-devel&m=140702291220410 for
+    details.
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bb3b561..02264d9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -948,6 +948,7 @@ install(TARGETS amarok ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ install(PROGRAMS amarok.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ install(PROGRAMS amarok_containers.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++install(FILES amarok.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
+ 
+ install(FILES amarok_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+ install(FILES amarok_codecinstall.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+diff --git a/src/amarok.appdata.xml b/src/amarok.appdata.xml
+new file mode 100644
+index 0000000..66c81be
+--- /dev/null
++++ b/src/amarok.appdata.xml
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop">
++  <id>amarok.desktop</id>
++  <metadata_license>CC0-1.0</metadata_license>
++  <name>Amarok</name>
++  <description>
++    <p>Amarok is a free, versatile and powerful music player.</p>
++    <p>Features:</p>
++    <ul>
++      <li>Dynamic playlists matching different criteria</li>
++      <li>Collection managing with rating support</li>
++      <li>Support for basic iPod, MTP and UMS music player devices</li>
++      <li>Integrated Internet services: last.fm, Magnatune, Jamendo, Ampache, mp3tunes and more.</li>
++      <li>Scripting support</li>
++      <li>Cover manager</li>
++      <li>Replay gain support</li>
++    </ul>
++  </description>
++  <url type="homepage">http://amarok.kde.org</url>
++  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=amarok</url>
++  <url type="help">http://docs.kde.org/development/en/extragear-multimedia/amarok/index.html</url>
++  <screenshots>
++    <screenshot type="default">
++      <image>http://kde.org/images/screenshots/amarok.png</image>
++    </screenshot>
++    <screenshot>
++      <image>https://amarok.kde.org/files/Amarok2.7screenie.png</image>
++    </screenshot>
++  </screenshots>
++  <project_group>KDE</project_group>
++  <provides>
++    <binary>amarok</binary>
++  </provides>
++</component>

diff --git a/amarok.spec b/amarok.spec
index 680bbf1..8e93ae0 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -4,7 +4,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.8.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -27,6 +27,8 @@ Patch1: amarok-2.8.0-no_kdewebkit.patch
 ## upstreamable patches
 
 ## upstream patches
+# master branch
+Patch100: Add_AppStream_metadata_for_Amarok.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -37,6 +39,9 @@ BuildRequires: kdelibs4-devel >= 4.9
 %if 0%{?kdewebkit}
 BuildRequires: kdelibs4-webkit-devel
 %endif
+%if 0%{?fedora} > 19
+BuildRequires: libappstream-glib
+%endif
 %if 0%{?fedora} > 18 || 0%{?rhel} > 6
 BuildRequires: mariadb-embedded-devel
 %else
@@ -119,6 +124,7 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q 
 
+%patch100 -p1 -b .appdata
 %patch0 -p1 -b .onlinedoc
 %if ! 0%{?kdewebkit}
 %patch1 -p1 -b .no_kdewebkit
@@ -148,6 +154,7 @@ rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,pla
 
 
 %check
+appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||:
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
 
@@ -186,6 +193,7 @@ fi
 %{_kde4_configdir}/amarok.knsrc
 %{_kde4_configdir}/amarok_homerc
 %{_kde4_configdir}/amarokapplets.knsrc
+%{_kde4_datadir}/appdata/%{name}.appdata.xml
 %{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/applications/kde4/amarok_containers.desktop
 %{_kde4_datadir}/applications/kde4/amzdownloader.desktop
@@ -254,6 +262,9 @@ fi
 
 
 %changelog
+* Fri Nov 07 2014 Rex Dieter <rdieter@fedoraproject.org> 2.8.0-12
+- pull in upstream (master/ branch) appdata
+
 * Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> 2.8.0-11
 - drop Requires: moodbar (which still pulls in gstreamer-0.10)