rpms/kdebase-workspace/F-11 .cvsignore, 1.32, 1.33 kdebase-workspace-4.2.95-default-applets.patch, 1.1, 1.2 kdebase-workspace.spec, 1.237, 1.238

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdebase-workspace-4.2.95-default-applets.patch 
	kdebase-workspace.spec 
Log Message:
* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
- adjust default-applets patch to not load plasma-networkmanagement



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	5 Aug 2009 00:22:24 -0000	1.32
+++ .cvsignore	19 Aug 2009 16:08:56 -0000	1.33
@@ -1,5 +1 @@
-kdebase-workspace-4.2.90.tar.bz2
-kdebase-workspace-4.2.95.tar.bz2
-kdebase-workspace-4.2.96.tar.bz2
-kdebase-workspace-4.2.98.tar.bz2
 kdebase-workspace-4.3.0.tar.bz2

kdebase-workspace-4.2.95-default-applets.patch:
 desktopcorona.cpp |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

Index: kdebase-workspace-4.2.95-default-applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace-4.2.95-default-applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-workspace-4.2.95-default-applets.patch	5 Aug 2009 00:22:25 -0000	1.1
+++ kdebase-workspace-4.2.95-default-applets.patch	19 Aug 2009 16:09:12 -0000	1.2
@@ -25,8 +25,8 @@ diff -ur kdebase-workspace-4.2.95/plasma
 +       engines->unloadEngine("powermanagement");
 +    }
 +
-+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
-+       loadDefaultApplet("networkmanagement", panel);
++    //if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
++    //   loadDefaultApplet("networkmanagement", panel);
      }
 -    engines->unloadEngine("powermanagement");
  


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- kdebase-workspace.spec	18 Aug 2009 18:26:21 -0000	1.237
+++ kdebase-workspace.spec	19 Aug 2009 16:09:19 -0000	1.238
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -528,7 +528,11 @@ fi
 %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
+
 %changelog
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-8
+- adjust default-applets patch to not load plasma-networkmanagement
+
 * Tue Aug 18 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-7
 - move akonadi stuff to subpackage