diff --git a/amarok.spec b/amarok.spec index 5b0f9dd..719f35c 100644 --- a/amarok.spec +++ b/amarok.spec @@ -8,7 +8,7 @@ Name: amarok Summary: Media player Version: 2.8.90 -Release: 3%{?dist} +Release: 4%{?dist} # KDE e.V. may determine that future GPL versions are accepted License: GPLv2 or GPLv3 @@ -46,7 +46,7 @@ BuildRequires: kdelibs4-devel >= 4.9 %if 0%{?kdewebkit} BuildRequires: kdelibs4-webkit-devel %endif -%if 0%{?fedora} > 20 +%if 0%{?fedora} > 21 BuildRequires: libappstream-glib %endif BuildRequires: mysql-devel @@ -62,6 +62,8 @@ BuildRequires: pkgconfig(taglib) >= 1.6 BuildRequires: pkgconfig(taglib-extras) >= 1.0.1 %if 0%{?fedora} +BuildRequires: kf5-rpm-macros +Requires: kf5-filesystem BuildRequires: liblastfm-devel >= 1.0.3 BuildRequires: pkgconfig(libmygpo-qt) >= 1.0.7 BuildRequires: pkgconfig(loudmouth-1.0) @@ -162,6 +164,17 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%if 0%{?fedora} +mkdir -p %{buildroot}%{_kf5_datadir}/solid/actions/ +cp -alf \ + %{buildroot}%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop \ + %{buildroot}%{_kf5_datadir}/solid/actions/ +mkdir -p %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus +cp -alf \ + %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/amarok_append.desktop \ + %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus/ +%endif + %find_lang amarok --with-kde --without-mo && mv amarok.lang amarok-doc.lang %find_lang amarok %find_lang amarokcollectionscanner_qt @@ -206,6 +219,8 @@ fi %{_kde4_bindir}/amarok_afttagger %if 0%{?fedora} %{_kde4_bindir}/amarokmp3tunesharmonydaemon +%{_kf5_datadir}/solid/actions/amarok-play-audiocd.desktop +%{_kf5_datadir}/kservices5/ServiceMenus/amarok_append.desktop %endif %{_kde4_bindir}/amzdownloader %{_kde4_appsdir}/amarok/ @@ -300,6 +315,9 @@ fi %changelog +* Tue Dec 29 2015 Rex Dieter 2.8.90-4 +- add support for kf5 solid/actions,ServiceMenus + * Thu Dec 10 2015 Rex Dieter 2.8.90-3 - workaround 'mysql_config --libmysqld-libs' madness (#1290517)