rpms/kdelibs/devel kdelibs-4.1.0-#455130.patch, NONE, 1.1 kdelibs.spec, 1.369, 1.370 kdelibs-4.0.98-revert-kinit-regression.patch, 1.2, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26511/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.0-#455130.patch 
Removed Files:
	kdelibs-4.0.98-revert-kinit-regression.patch 
Log Message:
* 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)

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/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- kdelibs.spec	29 Aug 2008 12:46:19 -0000	1.369
+++ kdelibs.spec	29 Aug 2008 14:54:03 -0000	1.370
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -77,9 +77,8 @@
 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
 
@@ -205,7 +204,7 @@
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch19 -p0 -b .kinit-regression
+%patch19 -p1 -b .#455130
 
 ## upstream patches
 
@@ -368,6 +367,10 @@
 
 
 %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
 


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