rpms/kdelibs4/F-8 kdelibs-4.0.4-kstandarddirs.patch, 1.1, 1.2 kdelibs4.spec, 1.20, 1.21

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9877/F-8

Modified Files:
	kdelibs-4.0.4-kstandarddirs.patch kdelibs4.spec 
Log Message:
Sync from kdelibs/F-9:

* 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

kdelibs-4.0.4-kstandarddirs.patch:

Index: kdelibs-4.0.4-kstandarddirs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs-4.0.4-kstandarddirs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.0.4-kstandarddirs.patch	4 Jun 2008 15:39:10 -0000	1.1
+++ kdelibs-4.0.4-kstandarddirs.patch	27 Jun 2008 02:29:13 -0000	1.2
@@ -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: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kdelibs4.spec	10 Jun 2008 18:22:38 -0000	1.20
+++ kdelibs4.spec	27 Jun 2008 02:29:13 -0000	1.21
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.5
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -156,6 +156,7 @@
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
+Provides: phonon-devel = 4.0
 Requires: qt4-devel
 Requires: openssl-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel
@@ -373,6 +374,13 @@
 
 
 %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
+
 * Tue Jun 10 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-2
 - kopete crashes with sending files over AIM/ICQ (kdebug:162956)
 - fix crashes when adding a new network folder (kdebug:162285)