[smokeqt] don't override CXXFLAGS (#884836, kde#315772)

[Rex Dieter]

commit f96187d06d13462959ff531eed608c8f9d34e474
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 25 20:38:58 2013 -0600

    don't override CXXFLAGS (#884836, kde#315772)

 smokeqt-build_flags.patch |   30 ++++++++++++++++++++++++++++++
 smokeqt.spec              |   11 ++++++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/smokeqt-build_flags.patch b/smokeqt-build_flags.patch
new file mode 100644
index 0000000..2c8948e
--- /dev/null
+++ b/smokeqt-build_flags.patch
@@ -0,0 +1,30 @@
+From 7a7aa2aafe098fa240519d1331bdc71bd113baf1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Mon, 25 Feb 2013 22:54:08 +0200
+Subject: [PATCH] Don't override user set CXXFLAGS.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Ville Skyttä <ville.skytta at iki.fi>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57eb1f4..05a626a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ endif (NOT LIB_INSTALL_DIR)
+ 
+ ## disable deprecation waringins
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-    set(CMAKE_CXX_FLAGS "-Wno-deprecated-declarations")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+ endif()
+ 
+ macro_optional_find_package(QImageBlitz)
+-- 
+1.7.11.7
+
diff --git a/smokeqt.spec b/smokeqt.spec
index 81ea168..e23ac8c 100644
--- a/smokeqt.spec
+++ b/smokeqt.spec
@@ -1,6 +1,6 @@
 Name:    smokeqt
 Version: 4.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Bindings for Qt libraries
 
 License: LGPLv2+
@@ -13,6 +13,10 @@ URL:     https://projects.kde.org/projects/kde/kdebindings/smoke
 %endif
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+## Upstreamable patches
+# http://bugs.kde.org/315772
+Patch50: smokeqt-build_flags.patch
+
 BuildRequires: cmake
 BuildRequires: pkgconfig(phonon)
 BuildRequires: pkgconfig(qimageblitz)
@@ -42,6 +46,8 @@ Conflicts: kdebindings-devel < 4.7.0
 %prep
 %setup -q
 
+%patch50 -p1 -b .build_flags
+
 
 %build
 mkdir -p %{_target_platform}
@@ -72,6 +78,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Feb 25 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.0-2
+- don't override CXXFLAGS (#884836, kde#315772)
+
 * Thu Jan 31 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.0-1
 - 4.10.0