rpms/kdelibs/F-9 kdelibs-4.0.4-kstandarddirs.patch, 1.2, 1.3 kdelibs.spec, 1.327, 1.328

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdelibs-4.0.4-kstandarddirs.patch kdelibs.spec 
Log Message:
* Fri Jun 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.5-4
- fix kstandarddirs patch so /usr/libexec/kde4 is found before /usr/bin (see
  also #453063, ensures the KDE 4 versions of kdesu, lnusertemp etc. are used)

kdelibs-4.0.4-kstandarddirs.patch:

Index: kdelibs-4.0.4-kstandarddirs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs-4.0.4-kstandarddirs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.0.4-kstandarddirs.patch	30 May 2008 17:05:09 -0000	1.2
+++ kdelibs-4.0.4-kstandarddirs.patch	27 Jun 2008 01:49:42 -0000	1.3
@@ -57,8 +57,8 @@
 +	}
 +
 +        // make sure we find the path where it's installed
-+        // for non-config files, we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share
-+        if (strcmp("config", type)) {
++        // for non-config, non-exe files, we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share
++        if (strcmp("config", type) && strcmp("exe", type)) {
 +            QString installdir = installPath( type );
 +            if (!installdir.isEmpty()) {
 +                bool ok = true;
@@ -103,7 +103,7 @@
              }
          }
  
-         // make sure we find the path where it's installed
+-        // make sure we find the path where it's installed
 -        QString installdir = installPath( type );
 -        if (!installdir.isEmpty()) {
 -            bool ok = true;
@@ -112,7 +112,8 @@
 -                    ok = false;
 -                    break;
 +        // for config files, we want the installed path _last_, so profiles take precedence
-+        if (!strcmp("config", type)) {
++        // for exe files too, so /usr/libexec/kde4 takes precedence over /usr/bin
++        if (!strcmp("config", type) || !strcmp("exe", type)) {
 +            QString installdir = installPath( type );
 +            if (!installdir.isEmpty()) {
 +                bool ok = true;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- kdelibs.spec	14 Jun 2008 23:56:22 -0000	1.327
+++ kdelibs.spec	27 Jun 2008 01:49:42 -0000	1.328
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -374,6 +374,10 @@
 
 
 %changelog
+* Fri Jun 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.5-4
+- fix kstandarddirs patch so /usr/libexec/kde4 is found before /usr/bin (see
+  also #453063, ensures the KDE 4 versions of kdesu, lnusertemp etc. are used)
+
 * Sat Jun 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.5-3
 - -devel: Provides: phonon-devel = 4.0