rpms/kdelibs/F-9 kdelibs-4.0.4-kstandarddirs.patch, NONE, 1.1 kdelibs.spec, 1.316, 1.317

[Rex Dieter (rdieter)]

Author: rdieter

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

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/F-9/kdelibs.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- kdelibs.spec	21 May 2008 14:48:47 -0000	1.316
+++ kdelibs.spec	22 May 2008 18:43:42 -0000	1.317
@@ -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 @@
 #Â 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 @@
 %patch15 -p0 -b .proxy
 %patch16 -p1 -b .phonon-hal
 %patch17 -p1 -b .remote-encoding
+%patch18 -p1 -b .kstandarddirs
 
 
 %build
@@ -362,7 +365,10 @@
 
 
 %changelog
-* Wed May 21 2008 Lukáš Tinkl <ltinkl at redhat.com>
+* Thu May 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.4-6
+- kstandarddirs hack to search /etc/kde
+
+* Wed May 21 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.4-5
 - fix problems with deleting dirs on FTP server (kdebug:162189)
 
 * Thu May 15 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.4-4