[rpms/amarok] epel10: name-spaced desktop/appdata now

[rpms/amarok] epel10: name-spaced desktop/appdata now

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 2d00c49f9a837deaabdeebd56a04dbd34073786c
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2017-04-03T12:29:02-05:00
Stats  : +11/-6 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/2d00c49f9a837deaabdeebd56a04dbd34073786c?branch=epel10

Log:
name-spaced desktop/appdata now

---
diff --git a/amarok.spec b/amarok.spec
index 92e2fd0..e0a3f50 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -213,6 +213,11 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# appdata/metainfo
+mkdir -p %{buildroot}%{_kde4_datadir}/appdata/
+mv %{buildroot}%{_kde4_datadir}/metainfo/*.xml \
+   %{buildroot}%{_kde4_datadir}/appdata/
+
 %if 0%{?fedora}
 mkdir -p %{buildroot}%{_kf5_datadir}/solid/actions/
 cp -alf \
@@ -236,10 +241,10 @@ rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,pla
 
 %check
 %if 0%{?fedora} > 20
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/*%{name}.appdata.xml
 %endif
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok_containers.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*amarok.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*amarok_containers.desktop
 
 
 %post
@@ -279,9 +284,9 @@ 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}/appdata/*%{name}.appdata.xml
+%{_kde4_datadir}/applications/kde4/*amarok.desktop
+%{_kde4_datadir}/applications/kde4/*amarok_containers.desktop
 %{_kde4_datadir}/applications/kde4/amzdownloader.desktop
 %{_kde4_datadir}/config.kcfg/amarokconfig.kcfg
 %{_kde4_datadir}/kde4/services/amarok-containment-*.desktop