From 85a5e0ec0260440364b84250d6ab6bc3f7be6196 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Fri, 28 Mar 2008 14:01:27 +0000
Subject: [PATCH] add Administration menu, bz#439378

---
 kdelibs-4.x-xdg-menu.patch | 57 ++++++++++++++++++++++++++++++++++++++
 kdelibs.spec               |  4 +--
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 kdelibs-4.x-xdg-menu.patch

diff --git a/kdelibs-4.x-xdg-menu.patch b/kdelibs-4.x-xdg-menu.patch
new file mode 100644
index 0000000..cd03edd
--- /dev/null
+++ b/kdelibs-4.x-xdg-menu.patch
@@ -0,0 +1,57 @@
+--- kdelibs-4.0.2/kded/applications.menu.orig	2008-01-05 01:00:10.000000000 +0100
++++ kdelibs-4.0.2/kded/applications.menu	2008-03-28 12:49:11.000000000 +0100
+@@ -31,12 +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>
+ 			</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>
+@@ -341,7 +360,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>
+@@ -350,7 +373,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>
diff --git a/kdelibs.spec b/kdelibs.spec
index e39bbcd..d92f952 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -355,7 +355,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Mar 28 2008 Than Ngo <than@redhat.com> -  4.0.2-12
+* Fri Mar 28 2008 Than Ngo <than@redhat.com> -  4.0.2-13
 - add Administration menu, bz#439378
 
 * Thu Mar 27 2008 Than Ngo <than@redhat.com> 4.0.2-12