diff --git a/.gitignore b/.gitignore index 47be98c..69b9a47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /kdelibs-4.6.5.tar.bz2 /kdelibs-4.7.4.tar.bz2 /kdelibs-4.7.97.tar.bz2 +/kdelibs-4.8.0.tar.bz2 diff --git a/kdelibs-4.5.80-libexecdir.patch b/kdelibs-4.8.0-libexecdir.patch similarity index 56% rename from kdelibs-4.5.80-libexecdir.patch rename to kdelibs-4.8.0-libexecdir.patch index a70f836..c6073b7 100644 --- a/kdelibs-4.5.80-libexecdir.patch +++ b/kdelibs-4.8.0-libexecdir.patch @@ -1,7 +1,7 @@ -diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp ---- kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.libexecdir 2010-11-19 04:52:23.000000000 -0600 -+++ kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp 2010-11-20 10:44:54.913612398 -0600 -@@ -1842,7 +1842,7 @@ void KStandardDirs::addKDEDefaults() +diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp +--- kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir 2012-01-10 15:17:51.000000000 +0100 ++++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp 2012-01-19 13:38:07.424309462 +0100 +@@ -1871,7 +1871,7 @@ void KStandardDirs::addKDEDefaults() addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); index+=2; } @@ -10,9 +10,9 @@ diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.5. addResourceDir("home", QDir::homePath(), false); -diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp ---- kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2010-11-05 05:48:28.000000000 -0500 -+++ kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp 2010-11-20 10:48:44.671378287 -0600 +diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp +--- kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2011-07-27 20:34:33.000000000 +0200 ++++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp 2012-01-19 13:38:07.424309462 +0100 @@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const if (strcmp("lib", type) == 0) return QFile::decodeName(LIB_INSTALL_DIR "/"); @@ -22,10 +22,10 @@ diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs if (strcmp("locale", type) == 0) return QFile::decodeName(LOCALE_INSTALL_DIR "/"); break; -diff -up kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp ---- kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir 2010-11-11 08:41:42.000000000 -0600 -+++ kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp 2010-11-20 10:44:54.914612189 -0600 -@@ -94,8 +94,9 @@ void KStandarddirsTest::testFindResource +diff -up kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp +--- kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir 2012-01-18 19:06:22.000000000 +0100 ++++ kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp 2012-01-19 13:42:17.955103619 +0100 +@@ -96,8 +96,9 @@ void KStandarddirsTest::testFindResource #define KIOSLAVE "bin/kioslave.exe" #else #define EXT "" @@ -36,7 +36,7 @@ diff -up kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4 const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); QVERIFY( !bin.isEmpty() ); QVERIFY( bin.endsWith( KIOSLAVE ) ); -@@ -221,7 +222,8 @@ void KStandarddirsTest::testFindExe() +@@ -231,7 +232,8 @@ void KStandarddirsTest::testFindExe() // findExe with a result in libexec const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); QVERIFY( !lnusertemp.isEmpty() ); @@ -45,11 +45,11 @@ diff -up kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4 + || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) ); #endif - // Check the "exe" resource too -diff -up kdelibs-4.5.80/kio/tests/krununittest.cpp.libexecdir kdelibs-4.5.80/kio/tests/krununittest.cpp ---- kdelibs-4.5.80/kio/tests/krununittest.cpp.libexecdir 2010-11-05 05:48:27.000000000 -0500 -+++ kdelibs-4.5.80/kio/tests/krununittest.cpp 2010-11-20 10:44:54.915612398 -0600 -@@ -148,7 +148,7 @@ void KRunUnitTest::testProcessDesktopExe + #ifndef Q_OS_MAC // kdeinit4 is a bundle on Mac, so the below doesn't work +diff -up kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir kdelibs-4.8.0/kio/tests/krununittest.cpp +--- kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir 2011-07-27 20:34:37.000000000 +0200 ++++ kdelibs-4.8.0/kio/tests/krununittest.cpp 2012-01-19 13:38:07.427309472 +0100 +@@ -160,7 +160,7 @@ void KRunUnitTest::testProcessDesktopExe if (kmailservice.isEmpty()) kmailservice = "kmailservice"; if (!kdeinit.isEmpty()) { QVERIFY(!kmailservice.isEmpty()); diff --git a/kdelibs.spec b/kdelibs.spec index fbcef81..4a54596 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -19,7 +19,7 @@ %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver}) Summary: KDE Libraries -Version: 4.7.97 +Version: 4.8.0 Release: 1%{?dist} Name: kdelibs @@ -87,7 +87,7 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch Patch12: kdelibs-4.1.0-xdg-menu.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec -Patch14: kdelibs-4.5.80-libexecdir.patch +Patch14: kdelibs-4.8.0-libexecdir.patch # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir} Patch18: kdelibs-4.6.90-kstandarddirs.patch @@ -575,6 +575,9 @@ rm -rf %{buildroot} %changelog +* Thu Jan 19 2012 Jaroslav Reznik - 6:4.8.0-1 +- 4.8.0 + * Wed Jan 04 2012 Radek Novacek - 6:4.7.97-1 - 4.7.97 diff --git a/sources b/sources index a224187..3258d3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd85943b3011035b0555da81de36d65e kdelibs-4.7.97.tar.bz2 +c19858c68f9a209ae521d7fb3c34747b kdelibs-4.8.0.tar.bz2