rpms/kdelibs/F-9 kdelibs-4.1.0-xdg-menu.patch, NONE, 1.1 kdelibs.spec, 1.338, 1.339 kdelibs-4.0.72-xdg-menu.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.0-xdg-menu.patch 
Removed Files:
	kdelibs-4.0.72-xdg-menu.patch 
Log Message:
* Sat Aug 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-6
- don't hide KDE 3 KCMs in kde4-applications.menu, not needed with our
  OnlyShowIn=KDE3 patch and breaks KDE 3 kcmshell in KDE 4 sessions

kdelibs-4.1.0-xdg-menu.patch:

--- NEW FILE kdelibs-4.1.0-xdg-menu.patch ---
diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applications.menu
--- kdelibs-4.1.0/kded/applications.menu	2008-05-21 13:07:34.000000000 +0200
+++ kdelibs-4.1.0-xdg-menu/kded/applications.menu	2008-08-23 09:45:03.000000000 +0200
@@ -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>
@@ -358,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>
@@ -367,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/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- kdelibs.spec	10 Aug 2008 16:52:20 -0000	1.338
+++ kdelibs.spec	23 Aug 2008 07:48:48 -0000	1.339
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -70,7 +70,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.0.72-xdg-menu.patch
+Patch12: kdelibs-4.1.0-xdg-menu.patch
 # Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
 Patch13: kdelibs-4.0.5-fedora-buildtype.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
@@ -376,6 +376,10 @@
 
 
 %changelog
+* Sat Aug 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-6
+- don't hide KDE 3 KCMs in kde4-applications.menu, not needed with our
+  OnlyShowIn=KDE3 patch and breaks KDE 3 kcmshell in KDE 4 sessions
+
 * Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-5
 - fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure)
 


--- kdelibs-4.0.72-xdg-menu.patch DELETED ---