rpms/kdebase-workspace/devel kdebase-workspace-4.2.90-show_systemsettings.patch, NONE, 1.1 kdebase-workspace.spec, 1.229, 1.230 kdebase-workspace-4.2.85-show-systemsettings.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26899

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.90-show_systemsettings.patch 
Removed Files:
	kdebase-workspace-4.2.85-show-systemsettings.patch 
Log Message:
rebase show_systemsettings patch


kdebase-workspace-4.2.90-show_systemsettings.patch:

--- NEW FILE kdebase-workspace-4.2.90-show_systemsettings.patch ---
diff -up kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2009-05-14 12:26:34.000000000 -0500
+++ kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp	2009-06-03 20:53:41.000000000 -0500
@@ -111,7 +111,6 @@ public:
               displayOrder(NameAfterDescription),
               allowSeparators(_allowSeparators)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop
--- kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings	2009-04-30 13:02:27.000000000 -0500
+++ kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop	2009-06-03 20:53:41.000000000 -0500
@@ -157,3 +157,4 @@ Name[zh_TW]=系統設定
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;
+OnlyShowIn=KDE;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- kdebase-workspace.spec	3 Jun 2009 22:16:30 -0000	1.229
+++ kdebase-workspace.spec	4 Jun 2009 02:03:30 -0000	1.230
@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch1: kdebase-workspace-4.2.85-redhat-startkde.patch
 Patch2: kdebase-workspace-4.2.85-plasma-konsole.patch
-Patch3: kdebase-workspace-4.2.85-show-systemsettings.patch
+Patch3: kdebase-workspace-4.2.90-show-systemsettings.patch
 Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
 Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
 #Â 441062: packagekit tools do not show icons correctly on KDE
@@ -202,7 +202,7 @@ Requires: PyKDE4 >= %{version}
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
 %patch2 -p1 -b .plasma-konsole
-%patch3 -p1 -b .show-systemsettings
+%patch3 -p1 -b .show_systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
 %patch4 -p1 -b .ck-shutdown
 %patch6 -p0 -b .timedate-kcm


--- kdebase-workspace-4.2.85-show-systemsettings.patch DELETED ---