rpms/kdelibs/F-9 kdelibs-4.0.5-fedora-buildtype.patch, 1.2, 1.3 kdelibs.spec, 1.330, 1.331 kdelibs-4.0.3-fedora-buildtype.patch, 1.3, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.5-fedora-buildtype.patch 
Removed Files:
	kdelibs-4.0.3-fedora-buildtype.patch 
Log Message:
* Sat Jul 19 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-2
- use better fedora-buildtype patch from F-9 branch


kdelibs-4.0.5-fedora-buildtype.patch:

Index: kdelibs-4.0.5-fedora-buildtype.patch
===================================================================
RCS file: kdelibs-4.0.5-fedora-buildtype.patch
diff -N kdelibs-4.0.5-fedora-buildtype.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kdelibs-4.0.5-fedora-buildtype.patch	19 Jul 2008 06:18:35 -0000	1.3
@@ -0,0 +1,17 @@
+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/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- kdelibs.spec	19 Jul 2008 03:13:11 -0000	1.330
+++ kdelibs.spec	19 Jul 2008 06:18:35 -0000	1.331
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.99
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -70,8 +70,8 @@
 # workaround for policykit
 Patch11: kdelibs-4.0.2-policykit-workaround.patch
 Patch12: kdelibs-4.0.72-xdg-menu.patch
-# Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
-Patch13: kdelibs-4.0.3-fedora-buildtype.patch
+# Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
+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
@@ -359,6 +359,9 @@
 
 
 %changelog
+* Sat Jul 19 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-2
+- use better fedora-buildtype patch from F-9 branch
+
 * Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
 - 4.0.99
 


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