rpms/kdelibs/devel kdelibs-4.x-xdg-menu.patch, NONE, 1.1 kdelibs.spec, 1.295, 1.296

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21245

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.x-xdg-menu.patch 
Log Message:
add Administration menu, bz#439378


kdelibs-4.x-xdg-menu.patch:

--- NEW FILE kdelibs-4.x-xdg-menu.patch ---
--- 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>


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- kdelibs.spec	27 Mar 2008 11:19:11 -0000	1.295
+++ kdelibs.spec	28 Mar 2008 14:01:27 -0000	1.296
@@ -74,6 +74,7 @@
 Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
 # workaround for policykit
 Patch11: kdelibs-4.0.2-policykit-workaround.patch
+Patch12: kdelibs-4.x-xdg-menu.patch
 
 # upstream patches
 Patch100: kdelibs-4.0.x-kio.patch
@@ -191,6 +192,7 @@
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
+%patch12 -p1 -b .Administration-menu
 
 # upstream patches
 %patch100 -p1 -b .kio
@@ -353,6 +355,9 @@
 
 
 %changelog
+* Fri Mar 28 2008 Than Ngo <than at redhat.com> -  4.0.2-12
+- add Administration menu, bz#439378
+
 * Thu Mar 27 2008 Than Ngo <than at redhat.com> 4.0.2-12
 - bz#428212, adapted Kevin Kofler's workaround for Policykit