rpms/kdelibs/F-10 kdelibs-4.2.85-kde149705.patch, NONE, 1.1 kdelibs-4.2.85-libexecdir.patch, NONE, 1.1 kdelibs-4.2.96-parallel_devel.patch, NONE, 1.1 .cvsignore, 1.66, 1.67 kdelibs.spec, 1.432, 1.433 sources, 1.81, 1.82 kdelibs-4.0.85-libexecdir.patch, 1.1, NONE kdelibs-4.1.82-kde149705.patch, 1.1, NONE kdelibs-4.1.96-AllowExternalPaths.patch, 1.1, NONE kdelibs-4.1.96-cmake.patch, 1.1, NONE kdelibs-4.1.96-parallel_devel.patch, 1.2, NONE kdelibs-4.2.3-fixPopupForPlasmaboard.patch, 1.1, NONE kdelibs-4.2.4-cve-2009-0945.patch, 1.1, NONE kdelibs-4.2.4-cve-2009-1690.patch, 1.1, NONE kdelibs-4.2.4-cve-2009-2537-select-length.patch, 1.1, NONE kdelibs-4.2.98-cve-2009-1687.patch, 1.1, NONE kdelibs-4.2.98-cve-2009-1698.patch, 1.1, NONE kdelibs-4.2.98-cve-2009-1725.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Tue Aug 4 19:32:57 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7630

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.2.85-kde149705.patch kdelibs-4.2.85-libexecdir.patch 
	kdelibs-4.2.96-parallel_devel.patch 
Removed Files:
	kdelibs-4.0.85-libexecdir.patch kdelibs-4.1.82-kde149705.patch 
	kdelibs-4.1.96-AllowExternalPaths.patch 
	kdelibs-4.1.96-cmake.patch kdelibs-4.1.96-parallel_devel.patch 
	kdelibs-4.2.3-fixPopupForPlasmaboard.patch 
	kdelibs-4.2.4-cve-2009-0945.patch 
	kdelibs-4.2.4-cve-2009-1690.patch 
	kdelibs-4.2.4-cve-2009-2537-select-length.patch 
	kdelibs-4.2.98-cve-2009-1687.patch 
	kdelibs-4.2.98-cve-2009-1698.patch 
	kdelibs-4.2.98-cve-2009-1725.patch 
Log Message:
* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
- 4.3.0


kdelibs-4.2.85-kde149705.patch:
 kdeui/icons/kicontheme.cpp       |    2 +-
 kdeui/kernel/kglobalsettings.cpp |    2 +-
 kutils/kdeglobals.kcfg           |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.2.85-kde149705.patch ---
diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp
--- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705	2009-04-15 12:26:44.000000000 +0200
+++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp	2009-05-11 16:01:29.000000000 +0200
@@ -525,7 +525,7 @@ QString KIconTheme::current()
     }
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) {
         *_theme = defaultThemeName();
     }
diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705	2009-03-27 15:47:33.000000000 +0100
+++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp	2009-05-11 16:00:06.000000000 +0200
@@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS
     if (kde_overrideStyle.isEmpty()) {
         const QString &defaultStyle = KStyle::defaultStyle();
         const KConfigGroup pConfig(KGlobal::config(), "General");
-        const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+        const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
         if (styleStr.isEmpty() ||
                 // check whether we already use the correct style to return then
diff -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg
--- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705	2009-04-15 12:26:45.000000000 +0200
+++ kdelibs-4.2.85/kutils/kdeglobals.kcfg	2009-05-11 16:00:06.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example "keramik" or "plastik". Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-4.2.85-libexecdir.patch:
 kdecore/kernel/kstandarddirs.cpp      |    2 +-
 kdecore/kernel/kstandarddirs_unix.cpp |    2 +-
 kdecore/tests/kstandarddirstest.cpp   |    5 +++--
 kio/tests/krununittest.cpp            |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-4.2.85-libexecdir.patch ---
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;
     }
-    addResourceType("exe", "lib", "kde4/libexec", true );
+    addResourceType("exe", 0, "libexec/kde4", true );
 
     addResourceDir("home", QDir::homePath(), false);
 
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 "/");
             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.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 ""
-#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 ) );
@@ -174,7 +175,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.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()) {
         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;

kdelibs-4.2.96-parallel_devel.patch:
 cmake/modules/FindKDE4Internal.cmake        |   36 ++++++++++++++--------------
 doc/api/doxygen-preprocess-kcfg.sh          |    4 +--
 kdecore/kconfig_compiler/CMakeLists.txt     |    6 ++--
 kdecore/kconfig_compiler/checkkcfg.pl       |    4 +--
 kdeui/tests/kconfig_compiler/CMakeLists.txt |    2 -
 kdewidgets/CMakeLists.txt                   |   12 ++++-----
 6 files changed, 33 insertions(+), 31 deletions(-)

--- NEW FILE kdelibs-4.2.96-parallel_devel.patch ---
diff -up kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-07-08 16:41:09.000000000 +0200
+++ kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake	2009-07-13 16:32:48.000000000 +0200
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 #  KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
 #  KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -129,7 +129,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -383,23 +383,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
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -497,7 +497,8 @@ else (_kdeBootStrapping)
 
    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+   link_directories("${KDE4_LIB_DIR}")
    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
 
 
@@ -510,12 +511,12 @@ else (_kdeBootStrapping)
 
    # get the build CONFIGURATIONS which were exported in this file, and use just the first
    # of them to get the location of the installed executables
-   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
+   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
    list(GET _importedConfigurations 0 _firstConfig)
 
-   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
+   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
    get_target_property(KDE4_MEINPROC_EXECUTABLE       ${KDE4_TARGET_PREFIX}meinproc4        LOCATION_${_firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets   LOCATION_${_firstConfig})
+   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4   LOCATION_${_firstConfig})
 
    # 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)
@@ -782,7 +783,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
 set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                               "${KDE4_BIN_INSTALL_DIR}" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH}
                               "${KDE4_LIB_INSTALL_DIR}" )
 
 # under Windows dlls may be also installed in bin/
@@ -1166,9 +1168,9 @@ macro (KDE4_PRINT_RESULTS)
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(AUTOMOC4_EXECUTABLE)
@@ -1187,7 +1189,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
    endif (NOT KDE4_INSTALLED_VERSION_OK)
 
    if (NOT KDE4_KCFGC_EXECUTABLE)
-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
    endif (NOT KDE4_KCFGC_EXECUTABLE)
 
    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh	2009-07-13 16:26:04.000000000 +0200
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-07-13 16:26:04.000000000 +0200
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -8,13 +8,13 @@ add_subdirectory( example )
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
diff -up kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.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
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   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.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdewidgets/CMakeLists.txt
--- kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.2.96/kdewidgets/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
@@ -14,24 +14,24 @@ include_directories( 
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp
@@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
 
    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
      COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
-     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
+     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
 
    set(kde3supportwidgets_PART_SRCS
       classpreviews.cpp


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	30 May 2009 13:41:42 -0000	1.66
+++ .cvsignore	4 Aug 2009 19:32:57 -0000	1.67
@@ -1 +1,2 @@
-kdelibs-4.2.4.tar.bz2
+kdelibs-4.2.98.tar.bz2
+kdelibs-4.3.0.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -p -r1.432 -r1.433
--- kdelibs.spec	26 Jul 2009 05:28:18 -0000	1.432
+++ kdelibs.spec	4 Aug 2009 19:32:57 -0000	1.433
@@ -1,6 +1,10 @@
+%define phonon_ver 4.3.1
+%define soprano_ver 2.3.0
+%define strigi_ver 0.7
+
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.4
-Release: 6%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -12,10 +16,8 @@ Provides:  kdelibs4 = %{version}-%{relea
 Name: kdelibs4
 %endif
 
-# LGPLv2: everything, except (see below)
-# BSD: kdoctools/
-# GFDL: kdoctools/customization ?
-License: LGPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+License: LGPLv2+
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
@@ -45,17 +47,17 @@ Requires: kdelibs-common
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: phonon%{?_isa} >= 4.3.0
-Requires: soprano%{?_isa} >= 2.2
-Requires: strigi-libs%{?_isa} >= 0.6.3
+Requires: phonon%{?_isa} >= %{phonon_ver} 
+Requires: soprano%{?_isa} >= %{soprano_ver} 
+Requires: strigi-libs%{?_isa} >= %{strigi_ver} 
 
 Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.1.96-parallel_devel.patch
+Patch0: kdelibs-4.2.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-4.1.82-kde149705.patch
+Patch2: kdelibs-4.2.85-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@@ -74,32 +76,13 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglob
 Patch11: kdelibs-4.1.72-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
-Patch14: kdelibs-4.0.85-libexecdir.patch
+Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
-Patch22: kdelibs-4.1.96-cmake.patch
-
-# upstreamable
-Patch50: kdelibs-4.2.3-fixPopupForPlasmaboard.patch
 
 # upstream
-# 4.2 branch
-# fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
-Patch100: kdelibs-4.2.4-cve-2009-1690.patch
-# fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl
-Patch101: kdelibs-4.2.4-cve-2009-0945.patch
-
 # 4.3 branch
-Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
-# fix CVE-2009-2537 - select length DoS
-Patch201: kdelibs-4.2.4-cve-2009-2537-select-length.patch
-# fix CVE-2009-1725 - crash, possible ACE in numeric character references
-Patch202: kdelibs-4.2.98-cve-2009-1725.patch
-# fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
-Patch203: kdelibs-4.2.98-cve-2009-1687.patch
-# fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
-Patch204: kdelibs-4.2.98-cve-2009-1698.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -135,10 +118,10 @@ BuildRequires: libxslt-devel libxml2-dev
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.3.0
+BuildRequires: phonon-devel >= %{phonon_ver} 
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 2.2
-BuildRequires: strigi-devel >= 0.6.3
+BuildRequires: soprano-devel >= %{soprano_ver} 
+BuildRequires: strigi-devel >= %{strigi_ver} 
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
@@ -170,6 +153,9 @@ This package includes the common files f
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+# stuff moved, help upgrade path
+Conflicts: kdebase-runtime < 4.2.90
+Conflicts: kdebase-workspace-devel < 4.2.90
 Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
@@ -223,27 +209,14 @@ format for easy browsing.
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
-%patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch22 -p1 -b .kdepimlibs-cmake
-
-%patch50 -p1 -b .fixPopupForPlasmaboard
 
 # upstream patches
-# 4.2
-%patch100 -p0 -b .cve-2009-1690
-%patch101 -p0 -b .cve-2009-0945
-
 # 4.3
-%patch200 -p1 -b .AllowExternalPaths
-%patch201 -p1 -b .cve-2009-2537-select-length
-%patch202 -p0 -b .cve-2009-1725
-%patch203 -p1 -b .cve-2009-1687
-%patch204 -p1 -b .cve-2009-1698
 
 
 %build
@@ -426,37 +399,54 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-6
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.98-4
+- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90
+
+* Sun Jul 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.98-3
+- fix CVE-2009-2537 - select length DoS
 - fix CVE-2009-1725 - crash, possible ACE in numeric character references
-- fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free)
-- fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
+- fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
 - fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
-- fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl
+- fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0)
 
-* Thu Jul 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.4-5
-- CVE-2009-2537 - select length DoS
-- correct fixPopupForPlasmaboard.patch
+* Fri Jul 24 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.98-2
+- respun tarball, to fix KIO HTTP redirects
+- fix phonon/strigi versions
 
-* Wed Jul 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-4
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- soprano_ver 2.3.0
+- License: LGPLv2+
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Wed Jul 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-4
 - fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki)
 
-* Mon Jun 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.4-3
-- fixPopupForPlasmaboard.patch
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- plasma animation crasher (kdebug#198338)
 
-* Mon Jun  1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- respun tarball
+* Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-2
+- up min versions, phonon, strigi, soprano (#509511)
 
-* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3 rc1
 
-* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-3
-- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
 
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-2
-- better fix for strcasestr detection
+* Tue May 12 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- KDE-4.3 beta1 (4.2.85)
+- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-14
+- -devel: Provides: kdelibs4-devel%%{?_isa} ...
 
 * Tue Apr 28 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-13
 - upstream patch to fix GCC4.4 crashes in kjs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	1 Jun 2009 11:51:51 -0000	1.81
+++ sources	4 Aug 2009 19:32:57 -0000	1.82
@@ -1 +1 @@
-9ed29086c33bc73256a7fa5268df560b  kdelibs-4.2.4.tar.bz2
+ea54f71bcbb0cf96bb6d94c019de8bb5  kdelibs-4.3.0.tar.bz2


--- kdelibs-4.0.85-libexecdir.patch DELETED ---


--- kdelibs-4.1.82-kde149705.patch DELETED ---


--- kdelibs-4.1.96-AllowExternalPaths.patch DELETED ---


--- kdelibs-4.1.96-cmake.patch DELETED ---


--- kdelibs-4.1.96-parallel_devel.patch DELETED ---


--- kdelibs-4.2.3-fixPopupForPlasmaboard.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-0945.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-1690.patch DELETED ---


--- kdelibs-4.2.4-cve-2009-2537-select-length.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1687.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1698.patch DELETED ---


--- kdelibs-4.2.98-cve-2009-1725.patch DELETED ---




More information about the fedora-extras-commits mailing list