rpms/kdebase-workspace/devel kdebase-workspace-4.1.1-show-systemsettings.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 kdebase-workspace.spec, 1.121, 1.122 sources, 1.21, 1.22 kdebase-workspace-4.1.0-kdm-appsdir.patch, 1.1, NONE kdebase-workspace-4.1.0-show-systemsettings.patch, 1.1, NONE

[Than Ngo]

Author: than

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

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.1.1-show-systemsettings.patch 
Removed Files:
	kdebase-workspace-4.1.0-kdm-appsdir.patch 
	kdebase-workspace-4.1.0-show-systemsettings.patch 
Log Message:
4.1.1


kdebase-workspace-4.1.1-show-systemsettings.patch:

--- NEW FILE kdebase-workspace-4.1.1-show-systemsettings.patch ---
diff -up kdebase-workspace-4.1.1/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.1.1/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.1.1/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2008-05-29 13:19:02.000000000 +0200
+++ kdebase-workspace-4.1.1/plasma/applets/kickoff/core/applicationmodel.cpp	2008-08-28 23:25:04.000000000 +0200
@@ -100,7 +100,6 @@ public:
           sortOrder(Qt::AscendingOrder),
           sortColumn(Qt::DisplayRole)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.1.1/systemsettings/systemsettings.desktop.show-systemsettings kdebase-workspace-4.1.1/systemsettings/systemsettings.desktop
--- kdebase-workspace-4.1.1/systemsettings/systemsettings.desktop.show-systemsettings	2008-08-28 10:06:58.000000000 +0200
+++ kdebase-workspace-4.1.1/systemsettings/systemsettings.desktop	2008-08-28 23:27:56.000000000 +0200
@@ -133,3 +133,4 @@ Name[zh_TW]=系統設定
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;System;
+OnlyShowIn=KDE;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	28 Jul 2008 19:04:32 -0000	1.18
+++ .cvsignore	29 Aug 2008 13:42:05 -0000	1.19
@@ -1 +1,2 @@
 kdebase-workspace-4.1.0.tar.bz2
+kdebase-workspace-4.1.1.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdebase-workspace.spec	4 Aug 2008 13:44:17 -0000	1.121
+++ kdebase-workspace.spec	29 Aug 2008 13:42:05 -0000	1.122
@@ -2,9 +2,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.0
+Version: 4.1.1
 
-Release: 8%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -14,7 +14,7 @@
 Patch1: kdebase-workspace-4.0.3-redhat-startkde.patch
 Patch2: kdebase-workspace-4.0.98-consolekit-kdm.patch
 Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch
-Patch4: kdebase-workspace-4.1.0-show-systemsettings.patch
+Patch4: kdebase-workspace-4.1.1-show-systemsettings.patch
 Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch
 #Â 434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch6: kdebase-workspace-4.0.72-rootprivs.patch
@@ -24,8 +24,6 @@
 Patch10: kdebase-workspace-4.0.72-klipper-url.patch
 # allows to define a default wallpaper via plasmarc:wallpaper
 Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch
-# 455623: Cannot install KDM Themes (KDM KCM uses wrong appsdir)
-Patch12: kdebase-workspace-4.1.0-kdm-appsdir.patch
 
 # upstream patches:
 # backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
@@ -167,11 +165,9 @@
 %patch8 -p0 -b .krdb
 %patch10 -p1 -b .klipper-url
 %patch11 -p1 -b .plasma-default-wallpaper
-%patch12 -p1 -b .kdm-appsdir
 
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
-%patch101 -p4 -b .kde#152914
 %patch102 -p0 -b .kwin-taskbarthumbnail
 
 # plasma-4.0-openSUSE patches:
@@ -313,6 +309,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Mon Aug 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-8
 - patch another place where systemsettings was hidden from the menu (#457739)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	28 Jul 2008 19:04:32 -0000	1.21
+++ sources	29 Aug 2008 13:42:05 -0000	1.22
@@ -1 +1 @@
-6d08adbb9944dea896ac65fd60d72377  kdebase-workspace-4.1.0.tar.bz2
+53805b96727db2fe30773a3fa9f78b73  kdebase-workspace-4.1.1.tar.bz2


--- kdebase-workspace-4.1.0-kdm-appsdir.patch DELETED ---


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