From 14c976fe44b22fae8dbda255ee26204c6d4129e5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 16 2015 17:56:15 +0000 Subject: support kde4 ServiceMenu too --- diff --git a/ark.spec b/ark.spec index 938cfcd..522ea02 100644 --- a/ark.spec +++ b/ark.spec @@ -5,7 +5,7 @@ Name: ark Summary: Archive manager Version: 15.08.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://utils.kde.org/projects/ark @@ -29,6 +29,8 @@ BuildRequires: bzip2-devel BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules +# macros.kde4 +BuildRequires: kde-filesystem BuildRequires: kf5-karchive-devel BuildRequires: kf5-kconfig-devel BuildRequires: kf5-kcrash-devel @@ -57,6 +59,8 @@ Obsoletes: kdeutils-ark < 6:4.7.80 Provides: kdeutils-ark = 6:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# kde4 ServiceMenu +Requires: kde-filesystem # Dependencies for archive plugins. # could split .desktop like okular to support these via @@ -114,6 +118,10 @@ rm -fv %{buildroot}%{_kf5_libdir}/libkerfuffle.so mv %{buildroot}%{_kf5_datadir}/appdata/ark.appdata.xml \ %{buildroot}%{_kf5_datadir}/appdata/org.kde.ark.appdata.xml ||: +# support kde4 servicemenus too +cp -alf %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus/ark*.desktop \ + %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ + %check appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.ark.appdata.xml ||: @@ -142,6 +150,7 @@ fi %{_kf5_datadir}/config.kcfg/ark.kcfg %{_kf5_datadir}/kservices5/ark*.desktop %{_kf5_datadir}/kservices5/ServiceMenus/ark*.desktop +%{_kde4_datadir}/kde4/services/ServiceMenus/ark*.desktop %{_kf5_datadir}/appdata/org.kde.ark.appdata.xml %{_kf5_datadir}/applications/org.kde.ark.desktop %{_kf5_datadir}/icons/hicolor/*/apps/ark.* @@ -161,6 +170,9 @@ fi %changelog +* Mon Nov 16 2015 Rex Dieter 15.08.3-2 +- support kde4 ServiceMenu too + * Mon Nov 16 2015 Rex Dieter 15.08.3-1 - 15.08.3, .spec cosmetics, fix appdata name