From e175d50814fc135a35ca3336e8a3434ac4bfb240 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 08 2015 12:35:19 +0000 Subject: restore xdg-menu patch --- diff --git a/kf5-kservice.spec b/kf5-kservice.spec index 5fcd9f2..d143daf 100644 --- a/kf5-kservice.spec +++ b/kf5-kservice.spec @@ -3,7 +3,7 @@ Name: kf5-%{framework} Summary: KDE Frameworks 5 Tier 3 solution for advanced plugin and service introspection Version: 5.14.3 -Release: 2%{?dist} +Release: 3%{?dist} # mixture of LGPLv2 and LGPLv2+ (mostly the latter) License: LGPLv2 @@ -18,6 +18,11 @@ URL: https://projects.kde.org/projects/frameworks/kservice %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +# Fedora customizations to the menu categories +# adds the Administration menu from redhat-menus which equals System + Settings +# This prevents the stuff getting listed twice, under both System and Settings. +Patch0: kservice-5.12.0-xdg-menu.patch + BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{versiondir} BuildRequires: kf5-kconfig-devel >= %{versiondir} @@ -30,6 +35,8 @@ BuildRequires: kf5-rpm-macros >= %{versiondir} BuildRequires: qt5-qtbase-devel Requires: kf5-filesystem >= %{versiondir} +# for the Administration category +Requires: redhat-menus %description KDE Frameworks 5 Tier 3 solution for advanced plugin and service @@ -48,6 +55,8 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} +%patch0 -p1 -b .xdg-menu + %build mkdir %{_target_platform} @@ -91,6 +100,9 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kservicetypes5 %changelog +* Thu Oct 08 2015 Rex Dieter 5.14.3-3 +- restore xdg-menu patch + * Wed Oct 07 2015 Rex Dieter 5.14.3-2 - .spec cosmetics, update URL/License, use %%license