rpms/kdebase/F-9 kdebase.spec, 1.346, 1.347 sources, 1.101, 1.102 kdebase-4.2.0-avoid_kde3_services.patch, 1.1, NONE kdebase-4.2.0-dolphin-qt45.patch, 1.1, NONE kdebase-4.2.0-konsole_kdeinit.patch, 1.1, NONE kdebase-4.2.1-konsole-keypad.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1443/F-9

Modified Files:
	kdebase.spec sources 
Removed Files:
	kdebase-4.2.0-avoid_kde3_services.patch 
	kdebase-4.2.0-dolphin-qt45.patch 
	kdebase-4.2.0-konsole_kdeinit.patch 
	kdebase-4.2.1-konsole-keypad.patch 
Log Message:
KDE 4.2.1



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- kdebase.spec	16 Feb 2009 13:30:35 -0000	1.346
+++ kdebase.spec	27 Feb 2009 15:38:33 -0000	1.347
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.2.0
-Release: 6%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -28,17 +28,9 @@
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 # Konsole patches
 Patch1:   kdebase-4.1.70-konsole-session.patch
+patch2:   kdebase-4.2.0-home-icon.patch
 
 ## upstream patches
-# bugs.kde.org/162729
-Patch100: kdebase-4.2.0-konsole_kdeinit.patch
-Patch101: kdebase-4.2.0-dolphin-qt45.patch
-# http://websvn.kde.org/?view=rev&revision=924926
-Patch102: kdebase-4.2.0-avoid_kde3_services.patch
-Patch103: kdebase-4.2.1-konsole-keypad.patch
-
-#Â Fedora custom patches
-Patch200: kdebase-4.2.0-home-icon.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -133,15 +125,7 @@
 %setup -q -n kdebase-%{version}
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
-
-%patch100 -p1 -b .konsole_kdeinit
-%if 0%{?fedora} > 10
-%patch101 -p1 -b .dolphin-qt45
-%endif
-%patch102 -p4 -b .avoid_kde3_services
-%patch103 -p0 -b .konsole-keypad
-
-%patch200 -p1 -b .home-icon
+%patch2 -p1 -b .home-icon
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -323,6 +307,12 @@
 
 
 %changelog
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Feb 16 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.0-6
 - unbreak apps like vim or mc under Konsole
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	28 Jan 2009 12:58:15 -0000	1.101
+++ sources	27 Feb 2009 15:38:33 -0000	1.102
@@ -1 +1 @@
-da86a8ad624e86eda3a7509f39272060  kdebase-4.2.0.tar.bz2
+a8f391db7b98feaa6ae81b8f1e99ed5a  kdebase-4.2.1.tar.bz2


--- kdebase-4.2.0-avoid_kde3_services.patch DELETED ---


--- kdebase-4.2.0-dolphin-qt45.patch DELETED ---


--- kdebase-4.2.0-konsole_kdeinit.patch DELETED ---


--- kdebase-4.2.1-konsole-keypad.patch DELETED ---