rpms/kdebase4/F-8 .cvsignore, 1.9, 1.10 kdebase4.spec, 1.15, 1.16 sources, 1.9, 1.10

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27700

Modified Files:
	.cvsignore kdebase4.spec sources 
Log Message:
sync w/ kdebase/F-9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 May 2008 18:57:23 -0000	1.9
+++ .cvsignore	5 Jun 2008 01:42:41 -0000	1.10
@@ -1 +1 @@
-kdebase-4.0.4.tar.bz2
+kdebase-4.0.5.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdebase4.spec	11 May 2008 09:15:20 -0000	1.15
+++ kdebase4.spec	5 Jun 2008 01:42:41 -0000	1.16
@@ -1,6 +1,6 @@
 
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.0.4
+Version: 4.0.5
 Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
@@ -32,6 +32,8 @@
 Patch100: kdebase-4.0.3-kde#160422.patch
 # http://bugzilla.redhat.com/438786 (will upstream -- Rex)
 Patch102: kdebase-4.0.3-kwrite-dt_categories.patch
+# backporte from 4.1
+Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -124,8 +126,8 @@
 %setup -q -n kdebase-%{version}
 
 %patch100 -p0 -b .kde#160422
-%patch102 -p1 -b kwrite-dt_categories
-
+%patch102 -p1 -b .kwrite-dt_categories
+%patch103 -p1 -b .konqueror-updatehistoryentry
 
 %build
 
@@ -304,6 +306,15 @@
 
 
 %changelog
+* Tue Jun 03 2008 Than Ngo <than at redhat.com> -  4.0.5-2
+- respun tarball from upstream
+
+* Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-1
+- 4.0.5
+
+* Sat May 24 2008 Than Ngo <than at redhat.com> 4.0.4-3
+- backport konqueror crash fix from trunk
+
 * Sun May 11 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.4-2
 - quote semicolon in fix for #442834
 - only do the echo when konquerorsu.desktop is actually shipped (#445989)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 May 2008 18:57:23 -0000	1.9
+++ sources	5 Jun 2008 01:42:41 -0000	1.10
@@ -1 +1 @@
-ba701b133d8ad080f8cf1a38e0cce6d9  kdebase-4.0.4.tar.bz2
+b3ba290cb675fbc4522704a39a503fe5  kdebase-4.0.5.tar.bz2