- fix #447965, order issue in kde path, thanks to Kevin

- backport patch to check html style version

kdelibs-4.0.4-kstandarddirs.patch

@@ -1,15 +0,0 @@
-diff -up kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp.dirs kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp
---- kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp.dirs	2008-05-22 12:17:33.000000000 -0500
-+++ kdelibs-4.0.4/kdecore/kernel/kstandarddirs.cpp	2008-05-22 12:27:50.000000000 -0500
-@@ -998,6 +998,10 @@ QStringList KStandardDirs::resourceDirs(
-                     if ((local || testdir.exists()) && !candidates.contains(path))
-                         candidates.append(path);
-                 }
-+                // UGLY HACK - forward porting Chris CHeney's HACK - Rex Dieter
-+                if ( local && (!strcmp("config", type)))
-+                  candidates.append("/etc/kde/");
-+                //
-                 local = false;
-             }
-         }
-diff -up kdelibs-4.0.4/kdecore/kernel/kstandarddirs_unix.cpp.dirs kdelibs-4.0.4/kdecore/kernel/kstandarddirs_unix.cpp

kdelibs-4.0.80-khtml-stylesheet.patch

@@ -0,0 +1,45 @@
+--- kdelibs-4.0.80/khtml/css/html4.css	(Revision 813565)
++++ kdelibs-4.0.80/khtml/css/html4.css	(Revision 813566)
+@@ -5,6 +5,8 @@
+  * Konqueror/khtml relies on the existence of this style sheet for
+  * rendering. Do not remove or modify this file unless you know
+  * what you are doing.
++ *
++ * KHTML_STYLE_VERSION: 1
+  */
+ 
+ @namespace "http://www.w3.org/1999/xhtml";
+--- kdelibs-4.0.80/khtml/css/cssstyleselector.cpp	(Revision 813565)
++++ kdelibs-4.0.80/khtml/css/cssstyleselector.cpp	(Revision 813566)
+@@ -62,12 +62,16 @@
+ #include <kconfig.h>
+ #include <QtCore/QFile>
+ #include <QtCore/QString>
++#include <QtCore/QFileInfo>
+ 
+ #include <kdebug.h>
+ #include <kurl.h>
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++// keep in sync with html4.css'
++#define KHTML_STYLE_VERSION 1
++
+ #undef RELATIVE
+ #undef ABSOLUTE
+ 
+@@ -386,6 +390,14 @@
+ 	    file[readbytes] = '\0';
+ 
+ 	QString style = QLatin1String( file.data() );
++	
++	QRegExp checkVersion( "KHTML_STYLE_VERSION:\\s*(\\d+)" );
++	checkVersion.setMinimal( true );
++	if (checkVersion.indexIn( style ) == -1 || checkVersion.cap(1).toInt() != KHTML_STYLE_VERSION) {
++	    qFatal( "!!!!!!! ERROR !!!!!!! - KHTML default stylesheet version mismatch. Aborting. Check your installation. File used was: %s. Expected STYLE_VERSION %d\n", 
++	        QFileInfo( f ).absoluteFilePath().toLatin1().data(), KHTML_STYLE_VERSION );
++        }
++	
+ 	if(s)
+ 	    style += s->settingsToCSS();
+ 	DOMString str(style);

kdelibs.spec

@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -77,9 +77,10 @@ Patch14: kdelibs-4.0.3-libexecdir.patch
 # patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46
 Patch15: kdelibs-4.0.4-proxy.patch
 # forward port kstandarddirs hack to search /etc/kde
-Patch18: kdelibs-4.0.4-kstandarddirs.patch
+Patch18: kdelibs-4.0.80-kstandarddirs.patch
 
 ## upstream patches
+Patch100: kdelibs-4.0.80-khtml-stylesheet.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -198,6 +199,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch15 -p0 -b .proxy
 %patch18 -p1 -b .kstandarddirs
 
+# upstream patches
+%patch100 -p1 -b .khtml-stylesheet
 
 %build
 
@@ -363,6 +366,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 30 2008 Than Ngo <than@redhat.com> 4.0.80-2
+- fix #447965, order issue in kde path, thanks to Kevin
+- backport patch to check html style version
+
 * Mon May 26 2008 Than Ngo <than@redhat.com> 4.0.80-1
 - 4.1 beta1