From 2845dbc9275224ddd748cb319083ae619ff6492b8e8d907ed8d4c9d1d8155647 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 18 Dec 2015 19:28:22 +0000 Subject: [PATCH] Accepting request 349324 from home:scarabeus_iv:branches:KDE:Applications - Install properly the ServiceMenus on plasma5 bnc#959490 OBS-URL: https://build.opensuse.org/request/show/349324 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=20 --- kgpg.changes | 5 +++++ kgpg.spec | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/kgpg.changes b/kgpg.changes index cc4caa1..886b2e8 100644 --- a/kgpg.changes +++ b/kgpg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 17 10:13:41 UTC 2015 - tchvatal@suse.com + +- Install properly the ServiceMenus on plasma5 bnc#959490 + ------------------------------------------------------------------- Sun Dec 13 13:19:12 UTC 2015 - tittiatcoke@gmail.com diff --git a/kgpg.spec b/kgpg.spec index 02744e8..a1fc77a 100644 --- a/kgpg.spec +++ b/kgpg.spec @@ -25,14 +25,15 @@ Group: Productivity/Security Url: http://www.kde.org Source0: kgpg-%{version}.tar.xz Patch1: kgpg-autostart.diff +BuildRequires: kf5-filesystem BuildRequires: libgpgme-devel BuildRequires: libkdepimlibs4-devel BuildRequires: xz Requires: gpg2 Recommends: kdepim4-runtime BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires -%kde4_pimlibs_requires +%{kde4_runtime_requires} +%{kde4_pimlibs_requires} %description Kgpg is a simple GUI for gpg @@ -48,6 +49,13 @@ Kgpg is a simple GUI for gpg %install %kde4_makeinstall -C build %suse_update_desktop_file kgpg Utility Security +# for 13.15+ symlink the servicemenus for plasma5/kf5 too +%if 0%{?suse_version} > 1310 +mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus +pushd %{buildroot}%{_kde4_servicesdir}/ServiceMenus/ > /dev/null +ln -s *.desktop %{buildroot}/%{_kf5_servicesdir}/ServiceMenus/ +popd > /dev/null +%endif %kde_post_install %post -p /sbin/ldconfig @@ -67,5 +75,7 @@ Kgpg is a simple GUI for gpg %{_kde4_datadir}/dbus-1/interfaces/*.xml %{_kde4_iconsdir}/hicolor/*/*/*.png %{_kde4_servicesdir}/ServiceMenus/*.desktop +%dir %{_kf5_servicesdir}/ServiceMenus/ +%{_kf5_servicesdir}/ServiceMenus/*.desktop %changelog