From cc73cb75e930eafe6b5eb40e2d2e0224655792d8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 24 Jul 2008 21:04:15 +0000 Subject: [PATCH] * Thu Jul 24 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package - fix #453063 (Sonnet documentation multilib conflict) properly --- .cvsignore | 1 + ...atch => kdelibs-4.0.99-kstandarddirs.patch | 53 ++++------- ...atch => kdelibs-4.1.0-parallel_devel.patch | 88 +++++++++---------- kdelibs.spec | 32 +++++-- sources | 2 +- 5 files changed, 88 insertions(+), 88 deletions(-) rename kdelibs-4.0.83-kstandarddirs.patch => kdelibs-4.0.99-kstandarddirs.patch (77%) rename kdelibs-4.0.98-parallel_devel.patch => kdelibs-4.1.0-parallel_devel.patch (81%) diff --git a/.cvsignore b/.cvsignore index 1d15dd3..064de7f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdelibs-4.0.99.tar.bz2 +kdelibs-4.1.0.tar.bz2 diff --git a/kdelibs-4.0.83-kstandarddirs.patch b/kdelibs-4.0.99-kstandarddirs.patch similarity index 77% rename from kdelibs-4.0.83-kstandarddirs.patch rename to kdelibs-4.0.99-kstandarddirs.patch index c15f2e3..d589576 100644 --- a/kdelibs-4.0.83-kstandarddirs.patch +++ b/kdelibs-4.0.99-kstandarddirs.patch @@ -1,6 +1,6 @@ -diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandarddirs/kdecore/kernel/kstandarddirs.cpp ---- kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp 2008-06-18 14:42:26.000000000 +0200 -+++ kdelibs-4.0.83-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-06-27 03:54:18.000000000 +0200 +diff -ur kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp +--- kdelibs-4.0.99/kdecore/kernel/kstandarddirs.cpp 2008-07-09 15:28:22.000000000 +0200 ++++ kdelibs-4.0.99-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-07-20 18:13:28.000000000 +0200 @@ -75,9 +75,12 @@ bool checkRestrictions : 1; QMap restrictions; @@ -14,7 +14,7 @@ diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandar // Directory dictionaries QMap absolutes; -@@ -952,12 +955,63 @@ +@@ -953,12 +956,65 @@ restrictionActive = true; d->dataRestrictionActive = false; // Reset } @@ -59,7 +59,9 @@ diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandar + } + + // make sure we find the path where it's installed -+ // for non-config, non-exe files, we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share ++ // we want the installed path _first_, so /usr/share/kde4 takes precedence over /usr/share ++ // except for config files, so profiles take precedence ++ // except for exe files too, so /usr/libexec/kde4 takes precedence over /usr/bin + if (strcmp("config", type) && strcmp("exe", type)) { + if (!installdir.isEmpty()) { + bool ok = true; @@ -78,7 +80,7 @@ diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandar if (!dirs.isEmpty()) { bool local = true; -@@ -983,55 +1037,47 @@ +@@ -984,45 +1040,34 @@ } } @@ -137,34 +139,13 @@ diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandar } - // make sure we find the path where it's installed -- if (!installdir.isEmpty()) { -- bool ok = true; -- foreach (const QString &s, candidates) { -- if (installdir.startsWith(s)) { -- ok = false; -- break; -+ // for config files, we want the installed path _last_, so profiles take precedence -+ // 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; -+ foreach (const QString &s, candidates) { -+ if (installdir.startsWith(s)) { -+ ok = false; -+ break; -+ } -+ } -+ if (ok) { -+ candidates.append(installdir); - } - } -- if (ok) -- candidates.append(installdir); - } - - dirs = d->absolutes.value(type); -@@ -1500,6 +1546,7 @@ ++ // find the installed path for all resource types ++ // some code expects it to always come last, so we list it again even if ++ // we had it already at the beginning + if (!installdir.isEmpty()) { + bool ok = true; + foreach (const QString &s, candidates) { +@@ -1501,6 +1546,7 @@ { localKdeDir = KShell::tildeExpand(localKdeDir); addPrefix(localKdeDir); @@ -172,7 +153,7 @@ diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandar } #ifdef Q_WS_MACX -@@ -1558,6 +1605,7 @@ +@@ -1559,6 +1605,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgConfigPrefix(localXdgDir); @@ -180,7 +161,7 @@ diff -ur kdelibs-4.0.83/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.83-kstandar for (QStringList::ConstIterator it = xdgdirList.begin(); it != xdgdirList.end(); ++it) -@@ -1606,6 +1654,7 @@ +@@ -1607,6 +1654,7 @@ localXdgDir = KShell::tildeExpand(localXdgDir); addXdgDataPrefix(localXdgDir); diff --git a/kdelibs-4.0.98-parallel_devel.patch b/kdelibs-4.1.0-parallel_devel.patch similarity index 81% rename from kdelibs-4.0.98-parallel_devel.patch rename to kdelibs-4.1.0-parallel_devel.patch index a54d373..5fad3a9 100644 --- a/kdelibs-4.0.98-parallel_devel.patch +++ b/kdelibs-4.1.0-parallel_devel.patch @@ -1,6 +1,6 @@ -diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake ---- kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-08 04:54:11.000000000 -0500 -+++ kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake 2008-07-10 20:54:43.000000000 -0500 +diff -up kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-07-23 10:26:30.000000000 +0200 ++++ kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake 2008-07-23 18:11:28.000000000 +0200 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: @@ -23,7 +23,7 @@ diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel # for Qt Designer plugins. # # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN) -@@ -286,23 +286,23 @@ if (_kdeBootStrapping) +@@ -307,23 +307,23 @@ if (_kdeBootStrapping) if (WIN32) set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC @@ -53,7 +53,7 @@ diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) -@@ -351,69 +351,69 @@ else (_kdeBootStrapping) +@@ -372,69 +372,69 @@ else (_kdeBootStrapping) include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) if (UNIX) @@ -63,88 +63,88 @@ diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel endif (UNIX) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) - - find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) + - find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) if (UNIX) - find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) - find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) ++ find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) # Can't do that, it's not always compiled. -@@ -432,14 +432,14 @@ else (_kdeBootStrapping) +@@ -453,14 +453,14 @@ else (_kdeBootStrapping) # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths @@ -163,7 +163,7 @@ diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel # allow searching cmake modules in all given kde install locations (KDEDIRS based) execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -@@ -668,7 +668,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY +@@ -708,7 +708,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY "${_CMAKE_INSTALL_DIR}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) @@ -173,7 +173,7 @@ diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel "${KDE4_LIB_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}/lib" "${CMAKE_INSTALL_PREFIX}/lib" ) -@@ -1059,9 +1060,9 @@ macro (KDE4_PRINT_RESULTS) +@@ -1108,9 +1109,9 @@ macro (KDE4_PRINT_RESULTS) endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE) @@ -185,9 +185,9 @@ diff -up kdelibs-4.0.98/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel endif(KDE4_KCFGC_EXECUTABLE) if(AUTOMOC4_EXECUTABLE) -diff -up kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh ---- kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 06:07:26.000000000 -0500 -+++ kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh 2008-07-10 20:53:39.000000000 -0500 +diff -up kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh +--- kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200 ++++ kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh 2008-07-23 18:01:48.000000000 +0200 @@ -2,9 +2,9 @@ # Generates and cleans KConfigXT source code during a API dox build # @@ -200,9 +200,9 @@ diff -up kdelibs-4.0.98/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelib exit 1; fi -diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl ---- kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500 -+++ kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-10 20:53:39.000000000 -0500 +diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl +--- kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200 ++++ kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl 2008-07-23 18:01:48.000000000 +0200 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; $kcfgc = $file . "c"; @@ -218,9 +218,9 @@ diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kde exit 1; } -diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt ---- kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:09:13.000000000 -0500 -+++ kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 +diff -up kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:09:13.000000000 +0200 ++++ kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -8,11 +8,11 @@ add_subdirectory( example ) set(kconfig_compiler_SRCS kconfig_compiler.cpp) @@ -236,9 +236,9 @@ diff -up kdelibs-4.0.98/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel k ########### install files ############### -diff -up kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt ---- kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 06:08:30.000000000 -0500 -+++ kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 +diff -up kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200 ++++ kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h @@ -248,9 +248,9 @@ diff -up kdelibs-4.0.98/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_dev # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) -diff -up kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.0.98/kdewidgets/CMakeLists.txt ---- kdelibs-4.0.98/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 06:08:17.000000000 -0500 -+++ kdelibs-4.0.98/kdewidgets/CMakeLists.txt 2008-07-10 20:53:39.000000000 -0500 +diff -up kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdewidgets/CMakeLists.txt +--- kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel 2008-05-21 13:08:17.000000000 +0200 ++++ kdelibs-4.1.0/kdewidgets/CMakeLists.txt 2008-07-23 18:01:48.000000000 +0200 @@ -16,22 +16,22 @@ include_directories( set(makekdewidgets_SRCS makekdewidgets.cpp ) diff --git a/kdelibs.spec b/kdelibs.spec index 4682404..ec47ff8 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.99 +Version: 4.1.0 Release: 2%{?dist} %if 0%{?fedora} > 8 @@ -50,7 +50,7 @@ Source1: kde4.sh Source2: kde4.csh # make -devel packages parallel-installable -Patch0: kdelibs-4.0.98-parallel_devel.patch +Patch0: kdelibs-4.1.0-parallel_devel.patch # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Hunspell support for K3Spell @@ -74,8 +74,8 @@ Patch12: kdelibs-4.0.72-xdg-menu.patch Patch13: kdelibs-4.0.5-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec Patch14: kdelibs-4.0.85-libexecdir.patch -# forward port kstandarddirs hack to search /etc/kde -Patch18: kdelibs-4.0.83-kstandarddirs.patch +# kstandarddirs changes: search /etc/kde, change handling of install locations +Patch18: kdelibs-4.0.99-kstandarddirs.patch # revert a kinit patch which triggers an assertion failure in KComponentData # (and its followup) (#455130) Patch19: kdelibs-4.0.98-revert-kinit-regression.patch @@ -114,6 +114,8 @@ BuildRequires: libxslt-devel libxml2-devel BuildRequires: OpenEXR-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +# work around circular dependency from phonon-devel pulling in phonon-backend-xine +BuildRequires: phonon-backend-gstreamer BuildRequires: phonon-devel BuildRequires: shared-mime-info BuildRequires: soprano-devel >= 2.0.97 @@ -264,6 +266,11 @@ popd install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh +# fix Sonnet documentation multilib conflict +bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2 +sed -i -e 's!!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache +bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache + # install apidocs and generator script install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh %endif @@ -310,6 +317,7 @@ rm -rf %{buildroot} %{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/servicetypes/* %{_kde4_sharedir}/icons/hicolor/*/actions/presence_* +%{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit4_*.so %dir %{_kde4_libdir}/kde4/ @@ -332,10 +340,9 @@ rm -rf %{buildroot} %{_kde4_configdir}/kdebugrc %dir %{_kde4_configdir}/ui %{_kde4_configdir}/ui/ui_standards.rc -%{_kde4_docdir}/HTML/en/common/ -%{_kde4_docdir}/HTML/en/sonnet/ -%{_kde4_datadir}/locale/all_languages/ %{_kde4_appsdir}/kdeui +%{_kde4_docdir}/HTML/en/common/ +%{_kde4_datadir}/locale/all_languages/ %endif %files devel @@ -359,6 +366,17 @@ rm -rf %{buildroot} %changelog +* Thu Jul 24 2008 Kevin Kofler 4.1.0-2 +- move Sonnet documentation back to the main package +- fix #453063 (Sonnet documentation multilib conflict) properly + +* Wed Jul 23 2008 Than Ngo 4.1.0-1 +- 4.1.0 + +* Sun Jul 20 2008 Kevin Kofler 4.0.99-3 +- fix kstandarddirs patch to always append the installed location last, even if + it is already present earlier in the search path (#456004) + * Sat Jul 19 2008 Rex Dieter 4.0.99-2 - use better fedora-buildtype patch from F-9 branch diff --git a/sources b/sources index ddeefb0..65c2fbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92e6d8d1bc0dccd8f5c204039c2aa00d kdelibs-4.0.99.tar.bz2 +86496aed25d4dce440418b3064a27913 kdelibs-4.1.0.tar.bz2