rpms/kdelibs/devel kdelibs-4.0.85-libexecdir.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 kdelibs.spec, 1.336, 1.337 sources, 1.63, 1.64 kdelibs-4.0.3-libexecdir.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.0.85-libexecdir.patch 
Removed Files:
	kdelibs-4.0.3-libexecdir.patch 
Log Message:
* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-1
- 4.0.85


kdelibs-4.0.85-libexecdir.patch:

--- NEW FILE kdelibs-4.0.85-libexecdir.patch ---
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()
         addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
         index+=2;
     }
-    addResourceType("exe", "lib", "kde4/libexec", true );
+    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
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
             if (strcmp("lib", type) == 0)
                 return QString::fromLatin1(LIB_INSTALL_DIR "/");
             if (strcmp("libexec", type) == 0)
-                return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
+                return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/");
             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
 #define KIOSLAVE "bin/kioslave.exe"
 #else
 #define EXT ""
-#define KIOSLAVE "kde4/libexec/kioslave"
+#define KIOSLAVE "libexec/kde4/kioslave"
 #endif
+
     const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
     QVERIFY( !bin.isEmpty() );
     QVERIFY( bin.endsWith( KIOSLAVE ) );
@@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe()
     // findExe with a result in libexec
     const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
     QVERIFY( !lnusertemp.isEmpty() );
-    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
+    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) ); 
 #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
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
     if (kmailservice.isEmpty()) kmailservice = "kmailservice";
     if (!kdeinit.isEmpty()) {
         QVERIFY(!kmailservice.isEmpty());
-        QVERIFY(kmailservice.contains("kde4/libexec"));
+        QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
     }
 
     QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Jun 2008 17:01:25 -0000	1.53
+++ .cvsignore	7 Jul 2008 12:38:52 -0000	1.54
@@ -1 +1 @@
-kdelibs-4.0.84.tar.bz2
+kdelibs-4.0.85.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- kdelibs.spec	27 Jun 2008 17:01:25 -0000	1.336
+++ kdelibs.spec	7 Jul 2008 12:38:52 -0000	1.337
@@ -1,6 +1,6 @@
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.0.84
+Version: 4.0.85
 Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
@@ -72,7 +72,7 @@
 # Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
 Patch13: kdelibs-4.0.3-fedora-buildtype.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
-Patch14: kdelibs-4.0.3-libexecdir.patch
+Patch14: kdelibs-4.0.85-libexecdir.patch
 # fix proxy support (#443931, kde#155707)
 # patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46
 Patch15: kdelibs-4.0.82-proxy.patch
@@ -210,7 +210,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 # build apidocs
@@ -356,6 +356,9 @@
 
 
 %changelog
+* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-1
+- 4.0.85
+
 * Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
 - 4.0.84
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	27 Jun 2008 17:01:25 -0000	1.63
+++ sources	7 Jul 2008 12:38:52 -0000	1.64
@@ -1 +1 @@
-1cb3aa8fe803499c3eedd3175681d07a  kdelibs-4.0.84.tar.bz2
+6ffe77d3538d6bbbb70a2295e1b186c5  kdelibs-4.0.85.tar.bz2


--- kdelibs-4.0.3-libexecdir.patch DELETED ---