[rocs] * Fri Dec 02 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.80-2 - CMakeLists.txt: Don't trash CMAKE

[Kevin Kofler]

commit 26c96bb6dc705fdaab22cdbe0899a5c514b54527
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Dec 3 00:08:03 2011 +0100

    * Fri Dec 02 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.80-2
    - CMakeLists.txt: Don't trash CMAKE_CXX_FLAGS (#759593)

 rocs-4.7.80-optflags.patch |   27 +++++++++++++++++++++++++++
 rocs.spec                  |   10 +++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/rocs-4.7.80-optflags.patch b/rocs-4.7.80-optflags.patch
new file mode 100644
index 0000000..3ab44b5
--- /dev/null
+++ b/rocs-4.7.80-optflags.patch
@@ -0,0 +1,27 @@
+From dc3089d4717334d7aa60d179ef8ddecf7dac8d30 Mon Sep 17 00:00:00 2001
+Message-Id: <dc3089d4717334d7aa60d179ef8ddecf7dac8d30.1322867115.git.Kevin at tigcc.ticalc.org>
+From: Kevin Kofler <Kevin at tigcc.ticalc.org>
+Date: Sat, 3 Dec 2011 00:05:08 +0100
+Subject: [PATCH] CMakeLists.txt: Don't trash CMAKE_CXX_FLAGS.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=759593
+---
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c636fd5..65b9dce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ remove_definitions(-DQT_NO_STL)
+ 
+-set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+ 
+ include_directories(
+   ${KDE4_INCLUDES}
+-- 
+1.7.6.4
+
diff --git a/rocs.spec b/rocs.spec
index 2173c4d..5d69498 100644
--- a/rocs.spec
+++ b/rocs.spec
@@ -2,12 +2,16 @@
 Name:    rocs 
 Summary: Graph Theory IDE 
 Version: 4.7.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+
 URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 Source0: http://download.kde.org/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 
+# upstream patches
+# CMakeLists.txt: Don't trash CMAKE_CXX_FLAGS (#759593)
+Patch100: rocs-4.7.80-optflags.patch
+
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
@@ -39,6 +43,7 @@ Requires: kdelibs4-devel
 
 %prep
 %setup -q
+%patch100 -p1 -b .optflags
 
 
 %build
@@ -95,6 +100,9 @@ fi
 
 
 %changelog
+* Fri Dec 02 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.80-2
+- CMakeLists.txt: Don't trash CMAKE_CXX_FLAGS (#759593)
+
 * Thu Dec 01 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.80-1
 - 4.7.80