* Sat Jul 12 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.98-2

- revert a kinit patch causing an assertion failure in KComponentData

(I hope this fixes the assertion failure.)

kdelibs-4.0.98-revert-kinit-regression.patch

@@ -0,0 +1,54 @@
+Index: kinit.cpp
+===================================================================
+--- kinit/kinit.cpp	(revision 829264)
++++ kinit/kinit.cpp	(revision 828077)
+@@ -49,10 +49,9 @@
+ #include <QtCore/QTextStream>
+ #include <QtCore/QRegExp>
+ #include <QtGui/QFont>
+-#include <QDir>
+ #include <kcomponentdata.h>
+ #include <kstandarddirs.h>
+-#include <kconfiggroup.h>
++#include <kglobalsettings.h>
+ #include <kglobal.h>
+ #include <kconfig.h>
+ #include <klibloader.h>
+@@ -263,7 +262,7 @@
+          write(child->sock, &request_header, sizeof(request_header));
+          write(child->sock, request_data, request_header.arg_length);
+          close(child->sock);
+-
++         
+          if (prev)
+          {
+             prev->next = child->next;
+@@ -530,17 +529,8 @@
+      if (cwd && *cwd)
+         chdir(cwd);
+      else {
+-         // Can't use KGlobalSettings::documentPath() here, we don't have a main component set,
+-         // and we don't want to set one; e.g. kioslaves will do that.
+-         // So we have to duplicate this stuff from KGlobalSettings.
+-         KConfigGroup g(s_instance->config(), "Paths");
+-         const QString documentPath = g.readPathEntry("Documents",
+-#ifdef Q_WS_WIN
+-                                                       getWin32ShellFoldersPath("Personal")
+-#else
+-                                                       QDir::homePath());
+-#endif
+-         const QByteArray docPath = QFile::encodeName(documentPath);
++         KComponentData componentData("klauncher"); // needed for KConfig usage
++         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
+          chdir(docPath.constData());
+      }
+ 
+@@ -1302,7 +1292,7 @@
+          children = child;
+ 
+          /* check child hasn't terminated already */
+-         if (kill(pid, 0))
++         if (kill(pid, 0)) 
+          {
+             children = child->next;
+             free(child);

kdelibs.spec

@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.98
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -78,6 +78,9 @@ Patch14: kdelibs-4.0.85-libexecdir.patch
 Patch15: kdelibs-4.0.82-proxy.patch
 # forward port kstandarddirs hack to search /etc/kde
 Patch18: kdelibs-4.0.83-kstandarddirs.patch
+# revert a kinit patch which triggers an assertion failure in KComponentData
+# (and its followup)
+Patch19: kdelibs-4.0.98-revert-kinit-regression.patch
 
 # upstream patches
 
@@ -202,6 +205,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 # appears to be obsoleted by: http://websvn.kde.org/?view=rev&revision=829797
 #patch15 -p1 -b .proxy
 %patch18 -p1 -b .kstandarddirs
+%patch19 -p0 -b .kinit-regression
 
 # upstream patches
 
@@ -359,6 +363,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul 12 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.98-2
+- revert a kinit patch causing an assertion failure in KComponentData
+
 * Thu Jul 10 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.98-1
 - 4.0.98
 - omit proxy patch (for now, needswork)