From 59a6eaa2873c8feac57428729228b8e345e630b0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 11 Jul 2008 03:57:48 +0000
Subject: [PATCH] * Thu Jul 10 2008 Rex Dieter <rdieter@fedoraproject.org>
 4.0.98-1 - 4.0.98 - omit proxy patch (for now, needswork)

---
 .cvsignore                                    |  2 +-
 ...tch => kdelibs-4.0.98-parallel_devel.patch | 65 ++++++++-----------
 kdelibs.spec                                  | 11 +++-
 sources                                       |  2 +-
 4 files changed, 36 insertions(+), 44 deletions(-)
 rename kdelibs-4.0.81-parallel_devel.patch => kdelibs-4.0.98-parallel_devel.patch (84%)

diff --git a/.cvsignore b/.cvsignore
index e8696b6..6b80e92 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdelibs-4.0.85.tar.bz2
+kdelibs-4.0.98.tar.bz2
diff --git a/kdelibs-4.0.81-parallel_devel.patch b/kdelibs-4.0.98-parallel_devel.patch
similarity index 84%
rename from kdelibs-4.0.81-parallel_devel.patch
rename to kdelibs-4.0.98-parallel_devel.patch
index 98e02dd..a54d373 100644
--- a/kdelibs-4.0.81-parallel_devel.patch
+++ b/kdelibs-4.0.98-parallel_devel.patch
@@ -1,13 +1,13 @@
-diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2008-06-12 22:12:53.000000000 +0200
-+++ kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake	2008-06-12 22:35:52.000000000 +0200
+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
 @@ -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_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
@@ -23,18 +23,13 @@ diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
  #    for Qt Designer plugins.
  #
  #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
-@@ -285,7 +285,7 @@ if (_kdeBootStrapping)
+@@ -286,23 +286,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 )
  
-       # use automoc4 from kdesupport if it has been found
-       if(AUTOMOC4_EXECUTABLE)
-@@ -295,10 +295,10 @@ if (_kdeBootStrapping)
-       endif(AUTOMOC4_EXECUTABLE)
- 
        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 )
@@ -43,11 +38,6 @@ diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
 -      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 )
  
-       # use automoc4 from kdesupport if it has been found
-       if(AUTOMOC4_EXECUTABLE)
-@@ -308,14 +308,14 @@ if (_kdeBootStrapping)
-       endif(AUTOMOC4_EXECUTABLE)
- 
        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 )
@@ -62,8 +52,8 @@ diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
 +   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
     set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
  
-    if(AUTOMOC4_EXECUTABLE)
-@@ -371,69 +371,69 @@ else (_kdeBootStrapping)
+    set(KDE4_INSTALLED_VERSION_OK TRUE)
+@@ -351,69 +351,69 @@ else (_kdeBootStrapping)
     include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
  
     if (UNIX)
@@ -154,7 +144,7 @@ diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
     set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
  
     # Can't do that, it's not always compiled.
-@@ -452,8 +452,8 @@ else (_kdeBootStrapping)
+@@ -432,14 +432,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,9 +153,6 @@ diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
 +   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
 +   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
  
-    if (AUTOMOC4_EXECUTABLE)
-       set(KDE4_AUTOMOC_EXECUTABLE "${AUTOMOC4_EXECUTABLE}")
-@@ -465,8 +465,8 @@ else (_kdeBootStrapping)
     find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
     find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
  
@@ -176,7 +163,7 @@ diff -up kdelibs-4.0.80/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)
-@@ -695,7 +695,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY
+@@ -668,7 +668,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY
                                "${_CMAKE_INSTALL_DIR}/bin"
                                "${CMAKE_INSTALL_PREFIX}/bin" )
  
@@ -186,7 +173,7 @@ diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
                                "${KDE4_LIB_INSTALL_DIR}"
                                "${_CMAKE_INSTALL_DIR}/lib" 
                                "${CMAKE_INSTALL_PREFIX}/lib" )
-@@ -1067,9 +1068,9 @@ macro (KDE4_PRINT_RESULTS)
+@@ -1059,9 +1060,9 @@ macro (KDE4_PRINT_RESULTS)
     endif (NOT _kdeBootStrapping)
  
     if(KDE4_KCFGC_EXECUTABLE)
@@ -197,10 +184,10 @@ diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
 +      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
     endif(KDE4_KCFGC_EXECUTABLE)
  
-    if(KDE4_AUTOMOC_EXECUTABLE)
-diff -up kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh
---- kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-06-01 08:12:31.000000000 +0200
-+++ kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh	2008-06-12 22:23:01.000000000 +0200
+    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
 @@ -2,9 +2,9 @@
  # Generates and cleans KConfigXT source code during a API dox build
  #
@@ -213,9 +200,9 @@ diff -up kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelib
  	exit 1;
  fi
  
-diff -up kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl
---- kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-06-01 08:17:18.000000000 +0200
-+++ kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl	2008-06-12 22:23:01.000000000 +0200
+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
 @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
  
  $kcfgc = $file . "c";
@@ -231,9 +218,9 @@ diff -up kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kde
    exit 1;
  }
  
-diff -up kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt
---- kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-06-01 08:17:18.000000000 +0200
-+++ kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt	2008-06-12 22:23:01.000000000 +0200
+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
 @@ -8,11 +8,11 @@ add_subdirectory( example )
  set(kconfig_compiler_SRCS kconfig_compiler.cpp)
  
@@ -249,9 +236,9 @@ diff -up kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel k
  
  
  ########### install files ###############
-diff -up kdelibs-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt
---- kdelibs-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-06-01 08:15:17.000000000 +0200
-+++ kdelibs-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt	2008-06-12 22:23:01.000000000 +0200
+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
 @@ -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
@@ -261,9 +248,9 @@ diff -up kdelibs-4.0.80/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.80/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.0.80/kdewidgets/CMakeLists.txt
---- kdelibs-4.0.80/kdewidgets/CMakeLists.txt.parallel_devel	2008-06-01 08:14:41.000000000 +0200
-+++ kdelibs-4.0.80/kdewidgets/CMakeLists.txt	2008-06-12 22:23:01.000000000 +0200
+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
 @@ -16,22 +16,22 @@ include_directories( 
  set(makekdewidgets_SRCS makekdewidgets.cpp )
  
diff --git a/kdelibs.spec b/kdelibs.spec
index ea3a01b..cd0d94b 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,6 +1,6 @@
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.0.85
+Version: 4.0.98
 Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
@@ -49,7 +49,7 @@ Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.0.81-parallel_devel.patch
+Patch0: kdelibs-4.0.98-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-3.95.0-kde149705.patch
 # Hunspell support for K3Spell
@@ -197,7 +197,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch12 -p1 -b .Administration-menu
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
-%patch15 -p1 -b .proxy
+# FIXME -- Rex
+#patch15 -p1 -b .proxy
 %patch18 -p1 -b .kstandarddirs
 
 # upstream patches
@@ -356,6 +357,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 10 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.98-1
+- 4.0.98
+- omit proxy patch (for now, needswork)
+
 * Sun Jul 06 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.85-1
 - 4.0.85
 
diff --git a/sources b/sources
index 136fc42..1ae427c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ffe77d3538d6bbbb70a2295e1b186c5  kdelibs-4.0.85.tar.bz2
+68465f41c45ae7fec0d15f13787b130b  kdelibs-4.0.98.tar.bz2