From a444a5e960ea6009c7e0ab3957201eeeb5fdbd80 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Thu, 22 May 2008 18:43:42 +0000
Subject: [PATCH] - port kstandarddirs hack, to search /etc/kde

---
 kdelibs-4.0.4-kstandarddirs.patch | 15 +++++++++++++++
 kdelibs.spec                      | 10 ++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 kdelibs-4.0.4-kstandarddirs.patch

diff --git a/kdelibs-4.0.4-kstandarddirs.patch b/kdelibs-4.0.4-kstandarddirs.patch
new file mode 100644
index 0000000..4e09876
--- /dev/null
+++ b/kdelibs-4.0.4-kstandarddirs.patch
@@ -0,0 +1,15 @@
+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
diff --git a/kdelibs.spec b/kdelibs.spec
index fc67741..35243d5 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,6 +84,8 @@ Patch16: kdelibs-4.0.4-phonon-hal.patch
 # kdebug:162189: Problems with deleting dirs on FTP server
 # http://websvn.kde.org/?view=rev&revision=810707
 Patch17: kdelibs-4.0.4-remote-encoding.patch
+# forward port kstandarddirs hack to search /etc/kde
+Patch18: kdelibs-4.0.4-kstandarddirs.patch
 
 ## upstream patches
 
@@ -205,6 +207,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch15 -p0 -b .proxy
 %patch16 -p1 -b .phonon-hal
 %patch17 -p1 -b .remote-encoding
+%patch18 -p1 -b .kstandarddirs
 
 
 %build
@@ -362,7 +365,10 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed May 21 2008 Lukáš Tinkl <ltinkl@redhat.com>
+* Thu May 22 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.4-6
+- kstandarddirs hack to search /etc/kde
+
+* Wed May 21 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-5
 - fix problems with deleting dirs on FTP server (kdebug:162189)
 
 * Thu May 15 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-4