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