rpms/kdelibs/devel kdelibs-4.2.85-libexecdir.patch,1.1,1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5844

Modified Files:
	kdelibs-4.2.85-libexecdir.patch 
Log Message:
touchup libexecdir


kdelibs-4.2.85-libexecdir.patch:

Index: kdelibs-4.2.85-libexecdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.2.85-libexecdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-4.2.85-libexecdir.patch	14 May 2009 15:01:50 -0000	1.1
+++ kdelibs-4.2.85-libexecdir.patch	14 May 2009 16:50:03 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp
---- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir	2008-07-03 00:06:28.000000000 -0500
-+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp	2008-07-06 14:38:18.000000000 -0500
-@@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults()
+diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
+--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir	2009-05-06 05:14:38.000000000 -0500
++++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp	2009-05-14 11:34:04.732889142 -0500
+@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
          addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
          index+=2;
      }
@@ -9,10 +9,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/k
 +    addResourceType("exe", 0, "libexec/kde4", true );
  
      addResourceDir("home", QDir::homePath(), false);
- }
-diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp
---- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir	2008-05-21 06:08:57.000000000 -0500
-+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp	2008-07-06 14:38:18.000000000 -0500
+ 
+diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
+--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir	2008-05-21 06:08:57.000000000 -0500
++++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp	2009-05-14 11:30:40.737623244 -0500
 @@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
              if (strcmp("lib", type) == 0)
                  return QString::fromLatin1(LIB_INSTALL_DIR "/");
@@ -22,10 +22,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/k
              if (strcmp("locale", type) == 0)
                  return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
              break;
-diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp
---- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir	2008-07-03 00:06:29.000000000 -0500
-+++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp	2008-07-06 14:41:31.000000000 -0500
-@@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource
+diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
+--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir	2009-02-27 06:31:32.000000000 -0600
++++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp	2009-05-14 11:30:40.737623244 -0500
+@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
  #define KIOSLAVE "bin/kioslave.exe"
  #else
  #define EXT ""
@@ -36,7 +36,7 @@ diff -up kdelibs-4.0.85/kdecore/tests/ks
      const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
      QVERIFY( !bin.isEmpty() );
      QVERIFY( bin.endsWith( KIOSLAVE ) );
-@@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe()
+@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
      // findExe with a result in libexec
      const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
      QVERIFY( !lnusertemp.isEmpty() );
@@ -45,9 +45,9 @@ diff -up kdelibs-4.0.85/kdecore/tests/ks
  #endif
  
      // Check the "exe" resource too
-diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp
---- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir	2008-05-21 06:08:08.000000000 -0500
-+++ kdelibs-4.0.85/kio/tests/krununittest.cpp	2008-07-06 14:38:18.000000000 -0500
+diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
+--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir	2008-05-21 06:08:08.000000000 -0500
++++ kdelibs-4.2.85/kio/tests/krununittest.cpp	2009-05-14 11:30:40.737623244 -0500
 @@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
      if (kmailservice.isEmpty()) kmailservice = "kmailservice";
      if (!kdeinit.isEmpty()) {