rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.0-default_applets.patch, 1.1, 1.2 kdebase-workspace.spec, 1.127, 1.128

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29160

Modified Files:
	kdebase-workspace-4.2.0-default_applets.patch 
	kdebase-workspace.spec 
Log Message:
* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
- respin default_applets patch for kpowersave too (F-9, #483163)


kdebase-workspace-4.2.0-default_applets.patch:

Index: kdebase-workspace-4.2.0-default_applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.2.0-default_applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.0-default_applets.patch	28 Jan 2009 12:54:57 -0000	1.1
+++ kdebase-workspace-4.2.0-default_applets.patch	30 Jan 2009 18:45:24 -0000	1.2
@@ -1,7 +1,8 @@
 diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
---- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig	2009-01-28 13:33:19.000000000 +0100
-+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-28 13:39:47.000000000 +0100
-@@ -200,15 +200,17 @@ void DesktopCorona::loadDefaultLayout()
+diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
+--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets	2009-01-06 11:22:28.000000000 -0600
++++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-30 12:40:53.000000000 -0600
+@@ -200,15 +200,18 @@ void DesktopCorona::loadDefaultLayout()
      loadDefaultApplet("tasks", panel);
      loadDefaultApplet("systemtray", panel);
  
@@ -12,7 +13,8 @@
 -        if (!batteries.isEmpty()) {
 -            loadDefaultApplet("battery", panel);
 -        }
-+    if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
++    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
++         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
 +       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
 +       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
 +       if (power) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdebase-workspace.spec	29 Jan 2009 19:41:04 -0000	1.127
+++ kdebase-workspace.spec	30 Jan 2009 18:45:24 -0000	1.128
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 4%{?dist}.1
+Release: 4%{?dist}.2
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -326,6 +326,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
+- respin default_applets patch for kpowersave too (F-9, #483163)
+
 * Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
 - conditionalize bluetooth backport on F10+
 - F9: revert solid-bluetooth to the version from KDE 4.1.4