diff --git a/kf5-kservice.spec b/kf5-kservice.spec index 4a7d674..f4b9ba3 100644 --- a/kf5-kservice.spec +++ b/kf5-kservice.spec @@ -21,7 +21,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra # 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 +Patch0: kservice-5.15.0-xdg-menu.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{versiondir} diff --git a/kservice-5.12.0-xdg-menu.patch b/kservice-5.12.0-xdg-menu.patch deleted file mode 100644 index 7388535..0000000 --- a/kservice-5.12.0-xdg-menu.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -ur kservice-5.12.0/src/kbuildsycoca/applications.menu kservice-5.12.0-xdg-menu/src/kbuildsycoca/applications.menu ---- kservice-5.12.0/src/kbuildsycoca/applications.menu 2015-07-05 11:13:00.000000000 +0200 -+++ kservice-5.12.0-xdg-menu/src/kbuildsycoca/applications.menu 2015-08-16 00:29:20.823019434 +0200 -@@ -31,29 +31,31 @@ - Core - KDE - -+ X-Red-Hat-Base - - X-SuSE-YaST -- X-KDE-settings-hardware -- X-KDE-settings-accessibility -- X-KDE-settings-components -- X-KDE-settings-desktop -- X-KDE-settings-looknfeel -- X-KDE-settings-network -- X-KDE-settings-webbrowsing -- X-KDE-settings-peripherals -- X-KDE-settings-hardware -- X-KDE-settings-power -- X-KDE-settings-security -- X-KDE-settings-sound -- X-KDE-settings-system -- X-KDE-information -- kde-kcm_knetworkconfmodule_ss.desktop -- kde-medianotifications.desktop -- kde-audioencoding.desktop - - - - -+ System Settings -+ SystemConfig.directory -+ -+ -+ System -+ Settings -+ X-Red-Hat-ServerConfig -+ -+ -+ -+ Server -+ ServerConfig.directory -+ -+ X-Red-Hat-ServerConfig -+ -+ -+ -+ - Development - kf5-development.directory - -@@ -369,7 +371,11 @@ - Settingsmenu - kf5-settingsmenu.directory - -- Settings -+ -+ Settings -+ System -+ X-Red-Hat-ServerConfig -+ - - - -@@ -378,7 +384,9 @@ - - - System -+ Settings - X-KDE-More -+ X-Red-Hat-ServerConfig - - - diff --git a/kservice-5.13.0.tar.xz b/kservice-5.13.0.tar.xz deleted file mode 100644 index 4b413ee..0000000 Binary files a/kservice-5.13.0.tar.xz and /dev/null differ diff --git a/kservice-5.15.0-xdg-menu.patch b/kservice-5.15.0-xdg-menu.patch new file mode 100644 index 0000000..db68867 --- /dev/null +++ b/kservice-5.15.0-xdg-menu.patch @@ -0,0 +1,75 @@ +diff -ur kservice-5.15.0/kbuildsycoca/applications.menu kservice-5.15.0-xdg-menu/kbuildsycoca/applications.menu +--- kservice-5.15.0/src/applications.menu 2015-07-05 11:13:00.000000000 +0200 ++++ kservice-5.15.0-xdg-menu/src/applications.menu 2015-08-16 00:29:20.823019434 +0200 +@@ -31,29 +31,31 @@ + Core + KDE + ++ X-Red-Hat-Base + + X-SuSE-YaST +- X-KDE-settings-hardware +- X-KDE-settings-accessibility +- X-KDE-settings-components +- X-KDE-settings-desktop +- X-KDE-settings-looknfeel +- X-KDE-settings-network +- X-KDE-settings-webbrowsing +- X-KDE-settings-peripherals +- X-KDE-settings-hardware +- X-KDE-settings-power +- X-KDE-settings-security +- X-KDE-settings-sound +- X-KDE-settings-system +- X-KDE-information +- kde-kcm_knetworkconfmodule_ss.desktop +- kde-medianotifications.desktop +- kde-audioencoding.desktop + + + + ++ System Settings ++ SystemConfig.directory ++ ++ ++ System ++ Settings ++ X-Red-Hat-ServerConfig ++ ++ ++ ++ Server ++ ServerConfig.directory ++ ++ X-Red-Hat-ServerConfig ++ ++ ++ ++ + Development + kf5-development.directory + +@@ -369,7 +371,11 @@ + Settingsmenu + kf5-settingsmenu.directory + +- Settings ++ ++ Settings ++ System ++ X-Red-Hat-ServerConfig ++ + + + +@@ -378,7 +384,9 @@ + + + System ++ Settings + X-KDE-More ++ X-Red-Hat-ServerConfig + + +