rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.224, 1.225 kdebase-workspace-4.2.85-knotificationitem-1.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-serv2768

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.2.85-knotificationitem-1.patch 
Log Message:
* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-3
- omit/revert session-button patch (kde#194506,rh#502953)
- drop unused knotificationitem-1 patch



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- kdebase-workspace.spec	27 May 2009 16:33:20 -0000	1.224
+++ kdebase-workspace.spec	29 May 2009 14:34:30 -0000	1.225
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.85
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -19,13 +19,14 @@ Patch6: kdebase-workspace-4.0.3-timedate
 #Â 441062: packagekit tools do not show icons correctly on KDE
 Patch7: kdebase-workspace-4.0.3-krdb.patch
 Patch8: kdebase-workspace-4.2.85-klipper-url.patch
+# document?  what does this do/patch?  why not upstreamed?
+# see also https://bugzilla.redhat.com/502953 , https://bugs.kde.org/194506
 Patch9: kdebase-workspace-4.1.80-session-button.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch12: kdebase-workspace-4.2.0-default_applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
-Patch16: kdebase-workspace-4.2.85-knotificationitem-1.patch
 
 # upstream patches:
 # trunk
@@ -205,16 +206,16 @@ Requires: PyKDE4 >= %{version}
 %patch6 -p0 -b .timedate-kcm
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
-%patch9 -p1 -b .session-button
+#patch9 -p1 -b .session-button
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
-#patch16 -p1 -b .knotificationitem-1
 
 # upstream patches
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -493,6 +494,10 @@ fi
 
 
 %changelog
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-3
+- omit/revert session-button patch (kde#194506,rh#502953)
+- drop unused knotificationitem-1 patch
+
 * Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
 - upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)
 - drop < F-10 crud, have_bluez3


--- kdebase-workspace-4.2.85-knotificationitem-1.patch DELETED ---