rpms/kdelibs4/F-7 kdelibs-3.94.0-parallel-devel.diff, NONE, 1.1 kdelibs-3.94.0-version-kpty.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 kdelibs4.spec, 1.2, 1.3 sources, 1.2, 1.3 kdelibs-3.93.0-colorscheme-hack.diff, 1.1, NONE kdelibs-3.93.0-kde149704.diff, 1.1, NONE kdelibs-3.93.0-parallel-devel.diff, 1.1, NONE

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Wed Oct 24 01:45:18 UTC 2007 

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6568/F-7

Modified Files:
	.cvsignore kdelibs4.spec sources 
Added Files:
	kdelibs-3.94.0-parallel-devel.diff 
	kdelibs-3.94.0-version-kpty.diff 
Removed Files:
	kdelibs-3.93.0-colorscheme-hack.diff 
	kdelibs-3.93.0-kde149704.diff 
	kdelibs-3.93.0-parallel-devel.diff 
Log Message:
Update from devel:
- don't make this the default kdelibs on F9 yet
- retry ppc64 build (#300571)
- update to 3.94.0
- BR soprano-devel >= 1.95.0
- don't rename js to kjs after installation, fixed upstream
- update parallel-devel patch
- drop kde#149704 patch, fixed upstream
- drop colorscheme-hack patch
- backport upstream fix for unversioned kpty library (rev 724528)
- add new BRs hspell-devel and jasper-devel
- 3.94.0 generates some manpages, add them to the file list
- drop optional BR hspell-devel again due to broken x86_64 static library

kdelibs-3.94.0-parallel-devel.diff:

--- NEW FILE kdelibs-3.94.0-parallel-devel.diff ---
diff -ur kdelibs-3.94.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.94.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.94.0/cmake/modules/FindKDE4Internal.cmake	2007-10-08 09:41:18.000000000 +0200
+++ kdelibs-3.94.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-10-18 12:08:54.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
 # 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:
@@ -123,7 +123,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)
@@ -274,24 +274,24 @@
    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_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
       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_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.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_KCONFIG_COMPILER_DEP kconfig_compiler4)
    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -344,83 +344,83 @@
    # this file contains all dependencies of all libraries of kdelibs, Alex
    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
 
-   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
 
-   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 )
    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 )
    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 )
    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 )
    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 )
    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 )
    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 )
    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 )
    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 )
    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_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 )
    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
 
-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_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 )
       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 )
       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 )
    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
 
-   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
 
-   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_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 )
    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 )
    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 )
    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 )
    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 )
    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 )
    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
 
    # Can't do that, it's not always compiled.
-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
 
    # Can't do that, it's not always compiled. See FindKMetaData.cmake
-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
 
    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -431,8 +431,8 @@
 
    # 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
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
 
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -440,8 +440,8 @@
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
 
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
 
    # 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)
@@ -590,7 +590,8 @@
                               "${_CMAKE_INSTALL_DIR}/bin"
                               "${CMAKE_INSTALL_PREFIX}/bin" )
 
-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}"
                               "${_CMAKE_INSTALL_DIR}/lib" 
                               "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -929,9 +930,9 @@
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found 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(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.94.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.94.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.94.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.94.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-10-18 12:05:41.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 -ur kdelibs-3.94.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.94.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.94.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.94.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-10-18 12:05:41.000000000 +0200
@@ -15,12 +15,12 @@
 
 $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 -ur kdelibs-3.94.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.94.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.94.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-10-03 12:49:47.000000000 +0200
+++ kdelibs-3.94.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-10-18 12:05:41.000000000 +0200
@@ -8,11 +8,11 @@
 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} )
 
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### install files ###############
diff -ur kdelibs-3.94.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.94.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.94.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-10-03 12:50:15.000000000 +0200
+++ kdelibs-3.94.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-10-18 12:05:41.000000000 +0200
@@ -9,7 +9,7 @@
    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 -ur kdelibs-3.94.0/kdewidgets/CMakeLists.txt kdelibs-3.94.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.94.0/kdewidgets/CMakeLists.txt	2007-10-03 12:50:13.000000000 +0200
+++ kdelibs-3.94.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-10-18 12:05:41.000000000 +0200
@@ -16,22 +16,22 @@
 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} )
 
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### 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

kdelibs-3.94.0-version-kpty.diff:

--- NEW FILE kdelibs-3.94.0-version-kpty.diff ---
--- trunk/KDE/kdelibs/kpty/CMakeLists.txt	2007/10/12 14:59:40	724527
+++ trunk/KDE/kdelibs/kpty/CMakeLists.txt	2007/10/12 15:01:14	724528
@@ -13,7 +13,7 @@
 
 target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY})
 
-#set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kpty
              RUNTIME DESTINATION ${BIN_INSTALL_DIR}
              LIBRARY DESTINATION ${LIB_INSTALL_DIR}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2007 14:26:01 -0000	1.2
+++ .cvsignore	24 Oct 2007 01:44:45 -0000	1.3
@@ -1,3 +1,4 @@
 clog
 kdelibs-3.92.0.tar.bz2
 kdelibs-3.93.0.tar.bz2
+kdelibs-3.94.0.tar.bz2


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs4.spec	21 Sep 2007 15:19:24 -0000	1.2
+++ kdelibs4.spec	24 Oct 2007 01:44:45 -0000	1.3
@@ -3,10 +3,10 @@
 # 1. package some noarch bits separately: apidocs.
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 3.93.0
-Release: 10%{?dist}
+Version: 3.94.0
+Release: 2%{?dist}
 
-%if 0%{?fedora} > 8
+%if 0%{?fedora} > 9
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
@@ -24,9 +24,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# rh#300571
-ExcludeArch: ppc64
-
 # for macros.kde4
 BuildRequires: kde-filesystem
 Requires: hicolor-icon-theme
@@ -39,17 +36,14 @@
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-3.93.0-parallel-devel.diff
+Patch0: kdelibs-3.94.0-parallel-devel.diff
 # fix kde#149703
 Patch1: kdelibs-3.93.0-kde149703.diff
-# fix kde#149704
-Patch2: kdelibs-3.93.0-kde149704.diff
 # fix kde#149705
-Patch3: kdelibs-3.93.0-kde149705.diff
-# KColorScheme was in a state of transition when Beta 2 was released, so
-# disabled text isn't handled properly. This hack restores the August 27
-# behavior (while keeping the August 29 API).
-Patch4: kdelibs-3.93.0-colorscheme-hack.diff
+Patch2: kdelibs-3.93.0-kde149705.diff
+# upstream patch by Oswald Buddenhagen to fix unversioned kpty library
+# SVN revision 724528
+Patch3: kdelibs-3.94.0-version-kpty.diff
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -68,6 +62,9 @@
 BuildRequires: gamin-devel
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
+# busted at least on x86_64
+#BuildRequires: hspell-devel
+BuildRequires: jasper-devel
 BuildRequires: krb5-devel
 BuildRequires: libacl-devel libattr-devel
 BuildRequires: libjpeg-devel
@@ -78,7 +75,7 @@
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel
+BuildRequires: soprano-devel >= 1.95.0
 BuildRequires: strigi-devel >= 0.5.5
 BuildRequires: zlib-devel
 
@@ -116,11 +113,8 @@
 %setup -q -n kdelibs-%{version}
 %patch0 -p1
 %patch1 -p1
-pushd kdeui
-%patch2 -p0
-popd
-%patch3 -p1
-%patch4 -p1
+%patch2 -p1
+%patch3 -p3
 
 
 %build
@@ -145,9 +139,6 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-# fix file conflict with mozilla's js (kde#149840)
-mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs
-
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
       %{buildroot}%{_kde4_bindir}/kunittestmodrunner
@@ -218,6 +209,7 @@
 %{_kde4_libdir}/kde4/
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
+%doc %{_mandir}/man*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -233,6 +225,24 @@
 
 
 %changelog
+* Thu Oct 18 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.94.0-2
+- drop optional BR hspell-devel again due to broken x86_64 static library
+
+* Thu Oct 18 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.94.0-1
+- update to 3.94.0
+- BR soprano-devel >= 1.95.0
+- don't rename js to kjs after installation, fixed upstream
+- update parallel-devel patch
+- drop kde#149704 patch, fixed upstream
+- drop colorscheme-hack patch
+- backport upstream fix for unversioned kpty library (rev 724528)
+- add new BRs hspell-devel and jasper-devel
+- 3.94.0 generates some manpages, add them to the file list
+
+* Thu Oct 4 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-11
+- don't make this the default kdelibs on F9 yet
+- retry ppc64 build (#300571)
+
 * Fri Sep 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-10
 - ExcludeArch: ppc64 (#300571)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2007 14:26:01 -0000	1.2
+++ sources	24 Oct 2007 01:44:45 -0000	1.3
@@ -1 +1,2 @@
 dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2
+3fe36def8619fb35c3d81630e2fce8a4  kdelibs-3.94.0.tar.bz2


--- kdelibs-3.93.0-colorscheme-hack.diff DELETED ---


--- kdelibs-3.93.0-kde149704.diff DELETED ---


--- kdelibs-3.93.0-parallel-devel.diff DELETED ---

More information about the fedora-extras-commits mailing list