rpms/kdelibs/F-9 kdelibs-4.1.0-#455130.patch, NONE, 1.1 kdelibs.spec, 1.343, 1.344 sources, 1.62, 1.63 kdelibs-4.0.98-revert-kinit-regression.patch, 1.1, NONE kdelibs-4.1.0-kcookiejar-crash.patch, 1.2, NONE kdelibs-4.1.0-kde#167826.patch, 1.2, NONE

[Than Ngo]

Author: than

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

Modified Files:
	kdelibs.spec sources 
Added Files:
	kdelibs-4.1.0-#455130.patch 
Removed Files:
	kdelibs-4.0.98-revert-kinit-regression.patch 
	kdelibs-4.1.0-kcookiejar-crash.patch 
	kdelibs-4.1.0-kde#167826.patch 
Log Message:
4.1.1


kdelibs-4.1.0-#455130.patch:

--- NEW FILE kdelibs-4.1.0-#455130.patch ---
diff -ur kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp
--- kdelibs-4.1.0/kdecore/config/kconfiggroup.cpp	2008-06-25 09:57:24.000000000 +0200
+++ kdelibs-4.1.0-#455130/kdecore/config/kconfiggroup.cpp	2008-08-29 14:48:54.000000000 +0200
@@ -393,7 +393,7 @@
 
             QString result;
             QByteArray oldpath = qgetenv( "PATH" );
-            QByteArray newpath = QFile::encodeName( KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) );
+            QByteArray newpath = QFile::encodeName( KGlobal::hasMainComponent() ? KGlobal::dirs()->resourceDirs( "exe" ).join( QChar( KPATH_SEPARATOR ) ) : QString() );
             if( !newpath.isEmpty() && !oldpath.isEmpty() )
                 newpath += KPATH_SEPARATOR;
             newpath += oldpath;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- kdelibs.spec	29 Aug 2008 08:43:19 -0000	1.343
+++ kdelibs.spec	29 Aug 2008 19:17:40 -0000	1.344
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.0
-Release: 9%{?dist}
+Version: 4.1.1
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -77,17 +77,10 @@
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
-# revert a kinit patch which triggers an assertion failure in KComponentData
-# (and its followup) (#455130)
-Patch19: kdelibs-4.0.98-revert-kinit-regression.patch
+# fix running commands in kglobalconfig before KComponentData init (#455130)
+Patch19: kdelibs-4.1.0-#455130.patch
 
 ## upstream patches
-# konq processes never terminate, 
-# http://bugs.kde.org/167825 , http://bugzilla.redhat.com/457526
-Patch100: kdelibs-4.1.0-kde#167826.patch
-# fix kcookiejar crash on invalid cookie file from KDE 3
-# http://websvn.kde.org/?view=rev&revision=844830
-Patch101: kdelibs-4.1.0-kcookiejar-crash.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -211,12 +204,9 @@
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch19 -p0 -b .kinit-regression
+%patch19 -p1 -b .#455130
 
 ## upstream patches
-%patch100 -p1 -b .kde#167826
-%patch101 -p0 -b .kcookiejar-crash
-
 
 %build
 
@@ -377,6 +367,13 @@
 
 
 %changelog
+* Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.1-2
+- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
+- drop revert-kinit-regression hack (fixes ioslave translations)
+
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
 * Fri Aug 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-9
 - -devel: +Requires: libutempter-devel (cmake wants to link it in)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	24 Jul 2008 21:04:15 -0000	1.62
+++ sources	29 Aug 2008 19:17:40 -0000	1.63
@@ -1 +1 @@
-86496aed25d4dce440418b3064a27913  kdelibs-4.1.0.tar.bz2
+fe3457ff49ed44a2084442a5950417be  kdelibs-4.1.1.tar.bz2


--- kdelibs-4.0.98-revert-kinit-regression.patch DELETED ---


--- kdelibs-4.1.0-kcookiejar-crash.patch DELETED ---


--- kdelibs-4.1.0-kde#167826.patch DELETED ---