kdelibs/kdelibs-4.10.0-xdg-menu.patch

76 lines
2.5 KiB
Diff

diff -up kdelibs-4.10.0/kded/applications.menu.Administration-menu kdelibs-4.10.0/kded/applications.menu
--- kdelibs-4.10.0/kded/applications.menu.Administration-menu 2013-01-23 15:44:19.000000000 -0600
+++ kdelibs-4.10.0/kded/applications.menu 2013-01-31 07:42:28.173553801 -0600
@@ -31,29 +31,31 @@
<Category>Core</Category>
<Not><Category>KDE</Category></Not>
</And>
+ <Category>X-Red-Hat-Base</Category>
<!-- Don't list SUSE's YaST in here -->
<Category>X-SuSE-YaST</Category>
- <Category>X-KDE-settings-hardware</Category>
- <Category>X-KDE-settings-accessibility</Category>
- <Category>X-KDE-settings-components</Category>
- <Category>X-KDE-settings-desktop</Category>
- <Category>X-KDE-settings-looknfeel</Category>
- <Category>X-KDE-settings-network</Category>
- <Category>X-KDE-settings-webbrowsing</Category>
- <Category>X-KDE-settings-peripherals</Category>
- <Category>X-KDE-settings-hardware</Category>
- <Category>X-KDE-settings-power</Category>
- <Category>X-KDE-settings-security</Category>
- <Category>X-KDE-settings-sound</Category>
- <Category>X-KDE-settings-system</Category>
- <Category>X-KDE-information</Category>
- <Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
- <Filename>kde-medianotifications.desktop</Filename>
- <Filename>kde-audioencoding.desktop</Filename>
</Not>
</Include>
</Menu>
<Menu>
+ <Name>System Settings</Name>
+ <Directory>SystemConfig.directory</Directory>
+ <Include>
+ <And>
+ <Category>System</Category>
+ <Category>Settings</Category>
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+ </And>
+ </Include>
+ <Menu>
+ <Name>Server</Name>
+ <Directory>ServerConfig.directory</Directory>
+ <Include>
+ <Category>X-Red-Hat-ServerConfig</Category>
+ </Include>
+ </Menu>
+ </Menu>
+ <Menu>
<Name>Development</Name>
<Directory>kde-development.directory</Directory>
<Menu>
@@ -369,7 +371,11 @@
<Name>Settingsmenu</Name>
<Directory>kde-settingsmenu.directory</Directory>
<Include>
- <Category>Settings</Category>
+ <And>
+ <Category>Settings</Category>
+ <Not><Category>System</Category></Not>
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+ </And>
</Include>
</Menu>
<Menu>
@@ -378,7 +384,9 @@
<Include>
<And>
<Category>System</Category>
+ <Not><Category>Settings</Category></Not>
<Not><Category>X-KDE-More</Category></Not>
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
</And>
</Include>
<Menu>