52ed5f7
diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/applications.menu
52ed5f7
--- kdelibs-4.0.72/kded/applications.menu	2008-03-26 22:10:55.000000000 +0100
52ed5f7
+++ kdelibs-4.0.72-xdg-menu/kded/applications.menu	2008-05-02 02:49:25.000000000 +0200
52ed5f7
@@ -31,6 +31,7 @@
85a5e0e
 					<Category>Core</Category>
85a5e0e
 					<Not><Category>KDE</Category></Not>
85a5e0e
 				</And>
85a5e0e
+				<Category>X-Red-Hat-Base</Category>
85a5e0e
 				
85a5e0e
 				<Category>X-SuSE-YaST</Category>
52ed5f7
 				<Category>X-KDE-settings-hardware</Category>
52ed5f7
@@ -54,6 +55,24 @@
85a5e0e
 		</Include>
85a5e0e
 	</Menu>
85a5e0e
 	<Menu>
85a5e0e
+		<Name>System Settings</Name>
85a5e0e
+		<Directory>SystemConfig.directory</Directory>
85a5e0e
+		<Include>
85a5e0e
+			<And>
85a5e0e
+				<Category>System</Category>
85a5e0e
+				<Category>Settings</Category>
85a5e0e
+				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
85a5e0e
+			</And>
85a5e0e
+		</Include>
85a5e0e
+		<Menu>
85a5e0e
+			<Name>Server</Name>
85a5e0e
+			<Directory>ServerConfig.directory</Directory>
85a5e0e
+			<Include>
85a5e0e
+				<Category>X-Red-Hat-ServerConfig</Category>
85a5e0e
+			</Include>
85a5e0e
+		</Menu>
85a5e0e
+	</Menu>
85a5e0e
+	<Menu>
85a5e0e
 		<Name>Development</Name>
85a5e0e
 		<Directory>kde-development.directory</Directory>
85a5e0e
 		<Menu>
52ed5f7
@@ -358,7 +377,11 @@
85a5e0e
 		<Name>Settingsmenu</Name>
85a5e0e
 		<Directory>kde-settingsmenu.directory</Directory>
85a5e0e
 		<Include>
85a5e0e
-			<Category>Settings</Category>
85a5e0e
+			<And>
85a5e0e
+				<Category>Settings</Category>
85a5e0e
+				<Not><Category>System</Category></Not>
85a5e0e
+				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
85a5e0e
+			</And>
85a5e0e
 		</Include>
85a5e0e
 	</Menu>
85a5e0e
 	<Menu>
52ed5f7
@@ -367,7 +390,9 @@
85a5e0e
 		<Include>
85a5e0e
 			<And>
85a5e0e
 				<Category>System</Category>
85a5e0e
+				<Not><Category>Settings</Category></Not>
85a5e0e
 				<Not><Category>X-KDE-More</Category></Not>
85a5e0e
+				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
85a5e0e
 			</And>
85a5e0e
 		</Include>
85a5e0e
 		<Menu>