rdieter pushed to clementine (master). "fix gst/moodbar compiler flags, simplify qca2 build dep"

[notifications at fedoraproject.org]

>From dab0941ca611a3b68b381315940f3fdeb6a13ee0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 4 May 2015 14:05:50 -0500
Subject: fix gst/moodbar compiler flags, simplify qca2 build dep


diff --git a/clementine-moodbar_flags.patch b/clementine-moodbar_flags.patch
new file mode 100644
index 0000000..430c5d0
--- /dev/null
+++ b/clementine-moodbar_flags.patch
@@ -0,0 +1,13 @@
+diff -up clementine-1.2.3/gst/moodbar/CMakeLists.txt.moodbar_flags clementine-1.2.3/gst/moodbar/CMakeLists.txt
+--- clementine-1.2.3/gst/moodbar/CMakeLists.txt.moodbar_flags	2014-09-22 04:44:59.000000000 -0500
++++ clementine-1.2.3/gst/moodbar/CMakeLists.txt	2015-05-04 14:02:29.008369066 -0500
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 2.6)
+ 
+-set(CMAKE_C_FLAGS "-Wall")
+-set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall")
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ 
diff --git a/clementine.spec b/clementine.spec
index 50942dd..bd1a8e7 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,6 +1,6 @@
 Name:           clementine
 Version:        1.2.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A music player and library organizer
 
 Group:          Applications/Multimedia
@@ -19,6 +19,8 @@ Patch4:         clementine-udisks-headers.patch
 # Use bundled sha2 library
 # https://github.com/clementine-player/Clementine/issues/4217
 Patch5:         clementine-do-not-use-system-sha2.patch
+# fix compiler flag handling in gst/moodbar, upstreamable --rex
+Patch6:         clementine-moodbar_flags.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -48,11 +50,7 @@ BuildRequires:  libprojectM-devel >= 2.0.1-7
 BuildRequires:  libqxt-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  protobuf-devel
-%if 0%{?fedora} >= 22
-BuildRequires:  qca-devel
-%else
-BuildRequires:  qca2-devel
-%endif
+BuildRequires:  pkgconfig(qca2)
 BuildRequires:  qt4-devel
 BuildRequires:  qjson-devel
 BuildRequires:  qtiocompressor-devel
@@ -82,6 +80,7 @@ music.
 %patch3 -p1 -b .desktop
 %patch4 -p1 -b .udisks-headers
 %patch5 -p1 -b .do-not-use-system-sha2
+%patch6 -p1 -b .moodbar_flags
 
 # Remove most 3rdparty libraries
 mv 3rdparty/{gmock,qocoa,qsqlite,sha2}/ .
@@ -148,6 +147,9 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/kde4/services/clementine-zune.protocol
 
 %changelog
+* Mon May 04 2015 Rex Dieter <rdieter at fedoraproject.org> 1.2.3-8
+- fix gst/moodbar compiler flags, simplify qca2 build dep
+
 * Wed Apr 29 2015 Kalev Lember <kalevlember at gmail.com> - 1.2.3-7
 - Rebuilt for protobuf soname bump
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/clementine.git/commit/?h=master&id=dab0941ca611a3b68b381315940f3fdeb6a13ee0