rpms/kdebase-workspace/devel .cvsignore, 1.32, 1.33 kdebase-workspace.spec, 1.248, 1.249 sources, 1.38, 1.39 kdebase-workspace-4.2.95-fix-version.patch, 1.1, NONE kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22624

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.2.95-fix-version.patch 
	kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch 
Log Message:
4.3rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	26 Jun 2009 10:09:21 -0000	1.32
+++ .cvsignore	9 Jul 2009 21:46:58 -0000	1.33
@@ -1,2 +1,3 @@
 kdebase-workspace-4.2.90.tar.bz2
 kdebase-workspace-4.2.95.tar.bz2
+kdebase-workspace-4.2.96.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- kdebase-workspace.spec	6 Jul 2009 09:16:30 -0000	1.248
+++ kdebase-workspace.spec	9 Jul 2009 21:46:58 -0000	1.249
@@ -2,9 +2,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.95
+Version: 4.2.96
 
-Release: 7%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -32,11 +32,6 @@ Patch16: kdebase-workspace-4.2.95-libxkl
 
 # upstream patches:
 # 4.3 branch
-# fix the internal version number in CMakeLists.txt so the CMake files get
-# installed to the expected location, otherwise our file list breaks
-Patch100: kdebase-workspace-4.2.95-fix-version.patch
-# plasma-desktop crashes when closing/opening windows
-Patch101: kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch
 
 # trunk
 
@@ -234,8 +229,6 @@ Requires: PyKDE4 >= %{version}
 %endif
 
 # upstream patches
-%patch100 -p0 -b .fix-version
-%patch101 -p1 -b .plasma-crash
 
 %build
 
@@ -519,6 +512,9 @@ fi
 
 
 %changelog
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
 * Mon Jul 06 2009 Than Ngo <than at redhat.com> - 4.2.95-7
 - plasma-desktop crashes when closing/opening windows (upstream patch)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	26 Jun 2009 10:09:21 -0000	1.38
+++ sources	9 Jul 2009 21:46:58 -0000	1.39
@@ -1 +1 @@
-fd95cf684f517bf45f8c26e0896d0593  kdebase-workspace-4.2.95.tar.bz2
+ee9a57af00c895afbf949fbf8d2a1590  kdebase-workspace-4.2.96.tar.bz2


--- kdebase-workspace-4.2.95-fix-version.patch DELETED ---


--- kdebase-workspace-4.2.95-plasma-crash-kde#197717.patch DELETED ---