rpms/kdelibs/F-10 kdelibs.spec,1.420,1.421

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdelibs.spec 
Log Message:
* 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)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- kdelibs.spec	23 Apr 2009 21:29:01 -0000	1.420
+++ kdelibs.spec	23 Apr 2009 22:50:28 -0000	1.421
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,8 +83,6 @@
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-# kconf_update script for Patch201 - to be upstreamed
-Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
 # upstream
 # 4.2 branch
@@ -99,6 +97,8 @@
 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
@@ -232,7 +232,6 @@
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
 # 4.2
@@ -246,6 +245,7 @@
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
 %patch201 -p0 -b .popupapplet-config
+%patch202 -p1 -b .popupapplet-kconf_update
 
 
 %build
@@ -428,8 +428,11 @@
 
 
 %changelog
+* 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)
+
 * Thu Apr 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-10
-- fix the kconf_update scriptlet for #495998
+- fix the kconf_update scriptlet for #495998 (broken .upd syntax)
 
 * Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
 - don't let plasma appear over screensaver