From 4ce6b3f308b07b0298cb45224692063b1a714ff4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 19 Jul 2008 06:18:35 +0000 Subject: [PATCH] * Sat Jul 19 2008 Rex Dieter 4.0.99-2 - use better fedora-buildtype patch from F-9 branch --- ...ildtype.patch => kdelibs-4.0.5-fedora-buildtype.patch | 4 ++-- kdelibs.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) rename kdelibs-4.0.3-fedora-buildtype.patch => kdelibs-4.0.5-fedora-buildtype.patch (90%) diff --git a/kdelibs-4.0.3-fedora-buildtype.patch b/kdelibs-4.0.5-fedora-buildtype.patch similarity index 90% rename from kdelibs-4.0.3-fedora-buildtype.patch rename to kdelibs-4.0.5-fedora-buildtype.patch index 098b8b3..1daacb1 100644 --- a/kdelibs-4.0.3-fedora-buildtype.patch +++ b/kdelibs-4.0.5-fedora-buildtype.patch @@ -5,13 +5,13 @@ diff -ur kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.3-fedora 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") ++ 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") ++ 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") diff --git a/kdelibs.spec b/kdelibs.spec index 5bd4abd..4682404 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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 @@ Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch # 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 @@ rm -rf %{buildroot} %changelog +* Sat Jul 19 2008 Rex Dieter 4.0.99-2 +- use better fedora-buildtype patch from F-9 branch + * Fri Jul 18 2008 Rex Dieter 4.0.99-1 - 4.0.99