[clementine/f14/master] * Fri Aug 06 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-8 - Enforce Fedora compil

Orcan Ogetbil oget at fedoraproject.org
Sat Aug 7 15:53:05 UTC 2010


commit 1dd8f92898122ff4348c835dd2f54949e7540665
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Aug 7 11:52:47 2010 -0400

    * Fri Aug 06 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-8
    - Enforce Fedora compilation flags

 clementine-fix-buildfags.patch |   13 +++++++++++++
 clementine.spec                |    9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/clementine-fix-buildfags.patch b/clementine-fix-buildfags.patch
new file mode 100644
index 0000000..c18dfd8
--- /dev/null
+++ b/clementine-fix-buildfags.patch
@@ -0,0 +1,13 @@
+diff -rupN clementine-0.4.2.old/src/CMakeLists.txt clementine-0.4.2/src/CMakeLists.txt
+--- clementine-0.4.2.old/src/CMakeLists.txt	2010-08-05 09:17:46.000000000 -0400
++++ clementine-0.4.2/src/CMakeLists.txt	2010-08-06 23:11:03.000000000 -0400
+@@ -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 "-Wall ${CMAKE_C_FLAGS}")
++set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall ${CMAKE_CXX_FLAGS}")
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories(${SPARKLE})
diff --git a/clementine.spec b/clementine.spec
index 3a69ca7..9d02c40 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,6 +1,6 @@
 Name:           clementine
 Version:        0.4.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A music player and library organizer
 
 Group:          Applications/Multimedia
@@ -31,6 +31,9 @@ Patch5:         clementine-font-paths.patch
 # http://code.google.com/p/clementine-player/issues/detail?id=463
 # From upstream trunk
 Patch6:         clementine-fix-lastfm-crash.patch
+# Enforce Fedora specific optimization flags. Accepted by upstream.
+# http://code.google.com/p/clementine-player/source/detail?r=1639
+Patch7:         clementine-fix-buildfags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -68,6 +71,7 @@ advantage of Qt4.
 %patch4 -p1 -b .qxt
 %patch5 -p1 -b .fontpaths
 %patch6 -p1 -b .fix.lastfm.crash
+%patch7 -p1 -b .build.flags
 
 # We already don't use these but just to make sure
 rm -fr 3rdparty/gmock
@@ -133,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Aug 06 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-8
+- Enforce Fedora compilation flags
+
 * Thu Aug 05 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-7
 - Fix crash on lastfm tree RHBZ#618474
 


More information about the scm-commits mailing list