rpms/kdelibs/F-9 kdelibs.spec, 1.396, 1.397 kdelibs-4.2.2-popupapplet-config.patch, 1.1, NONE kdelibs-4.2.2-popupapplet-kconf_update.patch, 1.3, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24668/F-9

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.2.2-popupapplet-config.patch 
	kdelibs-4.2.2-popupapplet-kconf_update.patch 
Log Message:
* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
- drop the PopupApplet configuration backports (#495998) for now, kconf_update
  does not work as expected for Plasma


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- kdelibs.spec	23 Apr 2009 22:50:29 -0000	1.396
+++ kdelibs.spec	24 Apr 2009 01:45:15 -0000	1.397
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,10 +95,6 @@
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
-Patch201: kdelibs-4.2.2-popupapplet-config.patch
-# kconf_update script for Patch201
-Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -244,8 +240,6 @@
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
-%patch201 -p0 -b .popupapplet-config
-%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,6 +422,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-12
+- drop the PopupApplet configuration backports (#495998) for now, kconf_update
+  does not work as expected for Plasma
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-11
 - fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
 


--- kdelibs-4.2.2-popupapplet-config.patch DELETED ---


--- kdelibs-4.2.2-popupapplet-kconf_update.patch DELETED ---