rpms/kdelibs/devel kdelibs-4.0.4-kstandarddirs.patch, NONE, 1.1 kdelibs.spec, 1.320, 1.321

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5675/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.4-kstandarddirs.patch 
Log Message:
- port kstandarddirs hack, to search /etc/kde


kdelibs-4.0.4-kstandarddirs.patch:

--- NEW FILE kdelibs-4.0.4-kstandarddirs.patch ---
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


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- kdelibs.spec	22 May 2008 12:24:30 -0000	1.320
+++ kdelibs.spec	22 May 2008 18:44:00 -0000	1.321
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.72
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,6 +79,8 @@
 # fix proxy support (#443931, kde#155707)
 # 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
 
 ## upstream patches
 
@@ -198,6 +200,7 @@
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch15 -p0 -b .proxy
+%patch18 -p1 -b .kstandarddirs
 
 
 %build
@@ -361,6 +364,9 @@
 
 
 %changelog
+* Thu May 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.72-6
+- kstandarddirs hack to search /etc/kde
+
 * Thu May 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.72-5
 - keep libphonon.so in %%{_libdir} for non-KDE apps (#447831)