rpms/kdelibs/F-10 kdelibs-4.1.3-kde#161117.patch, NONE, 1.1 kdelibs.spec, 1.387, 1.388

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1380

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.3-kde#161117.patch 
Log Message:
* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
- unmess Utilities menu (kdebug:161117)


kdelibs-4.1.3-kde#161117.patch:

--- NEW FILE kdelibs-4.1.3-kde#161117.patch ---
--- branches/KDE/4.1/kdelibs/kded/applications.menu	2008/07/09 10:18:33	829867
+++ branches/KDE/4.1/kdelibs/kded/applications.menu	2008/11/20 18:09:13	886953
@@ -393,16 +393,16 @@
 		<Name>Utilities</Name>
 		<Directory>kde-utilities.directory</Directory>
 		<Include>
-			<Or>
+			<And>
 				<Category>Utility</Category>
-				<Category>TextEditor</Category>
-				<Category>Accessibility</Category>
-				<Category>X-KDE-Utilities-Desktop</Category>
-				<Category>X-KDE-Utilities-File</Category>
-				<Category>X-KDE-Utilities-Peripherals</Category>
-				<Category>X-KDE-Utilities-PIM</Category>
-				<Category>X-KDE-More</Category>
-			</Or>
+				<Not><Category>X-KDE-More</Category></Not>
+			</And>
+			<Category>TextEditor</Category>
+			<Category>Accessibility</Category>
+			<Category>X-KDE-Utilities-Desktop</Category>
+			<Category>X-KDE-Utilities-File</Category>
+			<Category>X-KDE-Utilities-Peripherals</Category>
+			<Category>X-KDE-Utilities-PIM</Category>
 		</Include>
 		<Menu>
 			<Name>XUtilities</Name>


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- kdelibs.spec	12 Nov 2008 00:04:55 -0000	1.387
+++ kdelibs.spec	20 Nov 2008 18:16:25 -0000	1.388
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -78,6 +78,8 @@
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
+# unmess Utilities menu
+Patch100: kdelibs-4.1.3-kde#161117.patch
 Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
 
 BuildRequires: qt4-devel >= 4.4.0
@@ -204,6 +206,7 @@
 %patch20 -p1 -b .cmake
 
 ## upstream patches
+%patch100 -p4 -b .kde#161117
 %patch103 -p1 -b .kde#172182-http_cache_cleaner
 
 
@@ -365,6 +368,9 @@
 
 
 %changelog
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
+- unmess Utilities menu (kdebug:161117)
+
 * Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
 - backport http_cache_cleaner fix (kdebug:172182)