Sun Jun 1 12:09:44 UTC 2008

Author: than

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14894

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.5-fedora-buildtype.patch 
Removed Files:
	kdelibs-4.0.1-dcop-servicetype.patch 
	kdelibs-4.0.3-fedora-buildtype.patch kdelibs-4.0.4-kdesu.patch 
	kdelibs-4.0.4-kdirmodel-crash.patch 
	kdelibs-4.0.4-khtml-DOMStyleSheetList.patch 
	kdelibs-4.0.4-khtml-anonboxes.patch 
	kdelibs-4.0.4-khtml-combobox.patch 
	kdelibs-4.0.4-phonon-hal.patch 
	kdelibs-4.0.4-remote-encoding.patch 
Log Message:
4.0.5


kdelibs-4.0.5-fedora-buildtype.patch:

--- NEW FILE kdelibs-4.0.5-fedora-buildtype.patch ---
diff -ur kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake	2008-03-27 21:33:23.000000000 +0100
+++ kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake	2008-03-31 17:34:40.000000000 +0200
@@ -882,11 +882,13 @@
    set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
    set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
    set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+   set(CMAKE_CXX_FLAGS_FEDORA         "-DNDEBUG -DQT_NO_DEBUG")
    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
    set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
    set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+   set(CMAKE_C_FLAGS_FEDORA           "-DNDEBUG -DQT_NO_DEBUG")
 
    if (CMAKE_SYSTEM_NAME MATCHES Linux)
      set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- kdelibs.spec	30 May 2008 17:05:09 -0000	1.322
+++ kdelibs.spec	1 Jun 2008 12:09:02 -0000	1.323
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.0.4
-Release: 11%{?dist}
+Version: 4.0.5
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -57,9 +57,6 @@
 Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
 # openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
 Patch6: kdelibs-4.0.0-openssl.patch
-# fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin
-# (can't talk over D-Bus to an app only supporting DCOP)
-Patch7: kdelibs-4.0.1-dcop-servicetype.patch
 # install all .css files and Doxyfile.global in kdelibs-common to build
 # kdepimlibs-apidocs against
 Patch8: kdelibs-4.0.2-install-all-css.patch
@@ -72,33 +69,14 @@
 Patch11: kdelibs-4.0.2-policykit-workaround.patch
 Patch12: kdelibs-4.x-xdg-menu.patch
 # Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
-Patch13: kdelibs-4.0.3-fedora-buildtype.patch
+Patch13: kdelibs-4.0.5-fedora-buildtype.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.3-libexecdir.patch
 # fix proxy support (#443931, kde#155707)
 # patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46
 Patch15: kdelibs-4.0.4-proxy.patch
-# fix compatibility with newer HALs
-#Â http://websvn.kde.org/?view=rev&revision=807988
-Patch16: kdelibs-4.0.4-phonon-hal.patch
-#Â kdebug:162189: Problems with deleting dirs on FTP server
-#Â http://websvn.kde.org/?view=rev&revision=810707
-Patch17: kdelibs-4.0.4-remote-encoding.patch
 # forward port kstandarddirs hack to search /etc/kde
 Patch18: kdelibs-4.0.4-kstandarddirs.patch
-#447840: Konquerorsu crash in KDE 4
-Patch19: kdelibs-4.0.4-kdesu.patch
-#Â fix kdebug:161196: Drop-down list options display blank when a comment is added between option tags
-#Â http://websvn.kde.org/?view=rev&revision=812985
-Patch20: kdelibs-4.0.4-khtml-combobox.patch
-#Â fix kdebug:156419: konqueror crash on http://pidgin.im
-#Â http://websvn.kde.org/?view=rev&revision=812954
-Patch21: kdelibs-4.0.4-khtml-anonboxes.patch
-# fix kdebug:48704: document.styleSheets.length does not return the correct number under all circumstances 
-#Â http://websvn.kde.org/?view=rev&revision=812538
-Patch22: kdelibs-4.0.4-khtml-DOMStyleSheetList.patch
-# http://websvn.kde.org/?view=rev&revision=813404
-Patch23: kdelibs-4.0.4-kdirmodel-crash.patch
 
 ## upstream patches
 Patch100: kdelibs-4.0.4-khtml-stylesheet.patch
@@ -209,7 +187,6 @@
 # shouldn't be needed f9+, we'll see -- Rex
 %patch6 -p1 -b .openssl
 %endif
-%patch7 -p1 -b .dcop-servicetype
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
@@ -219,14 +196,7 @@
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
 %patch15 -p0 -b .proxy
-%patch16 -p1 -b .phonon-hal
-%patch17 -p1 -b .remote-encoding
 %patch18 -p1 -b .kstandarddirs
-%patch19 -p1 -b .kdesu
-%patch20 -p1 -b .khtml-combobox
-%patch21 -p1 -b .khtml-anonboxes
-%patch22 -p1 -b .khtml-DOMStyleSheetList
-%patch23 -p1 -b .kdirmodel-crash
 
 # upstream patches
 %patch100 -p1 -b .khtml-stylesheet
@@ -390,6 +360,9 @@
 
 
 %changelog
+* Sat May 31 2008 Than Ngo <than at redhat.com> 4.0.5-1
+- 4.0.5
+
 * Fri May 30 2008 Than Ngo <than at redhat.com> 4.0.4-11
 - fix #447965, order issue in kde path, thanks to Kevin
 - backport patch to check html style version


--- kdelibs-4.0.1-dcop-servicetype.patch DELETED ---


--- kdelibs-4.0.3-fedora-buildtype.patch DELETED ---


--- kdelibs-4.0.4-kdesu.patch DELETED ---


--- kdelibs-4.0.4-kdirmodel-crash.patch DELETED ---


--- kdelibs-4.0.4-khtml-DOMStyleSheetList.patch DELETED ---


--- kdelibs-4.0.4-khtml-anonboxes.patch DELETED ---


--- kdelibs-4.0.4-khtml-combobox.patch DELETED ---


--- kdelibs-4.0.4-phonon-hal.patch DELETED ---


--- kdelibs-4.0.4-remote-encoding.patch DELETED ---


