spot pushed to mscore (master). "add BR: doxygen, -fsigned-char for arm"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 25 22:26:53 UTC 2015


>From 79012e95492adbe4946dd0682958bd9cf265f520 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Sat, 25 Apr 2015 18:26:34 -0400
Subject: add BR: doxygen, -fsigned-char for arm


diff --git a/mscore.spec b/mscore.spec
index 9ed0e1a..6faed91 100644
--- a/mscore.spec
+++ b/mscore.spec
@@ -1,11 +1,16 @@
 %global fontfamilyname %{name}
 %global shortver 2.0
 
+%ifarch arm
+%global myoptflags "%{optflags} -fsigned-char"
+%else
+%global myoptflags "%{optflags}"
+%endif
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       %{shortver}.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -56,6 +61,7 @@ BuildRequires: qt5-qtxmlpatterns-devel
 BuildRequires: qt5-qtwebkit-devel
 BuildRequires: qtsingleapplication-devel
 BuildRequires: perl(Pod::Usage)
+BuildRequires: doxygen
 
 Requires:      %{name}-fonts = %{version}-%{release}
 Requires:      soundfont2-default
@@ -127,7 +133,7 @@ This package contains the musical notation fonts for use of MuseScore.
 rm thirdparty/rtf2html/rtf2html
 
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i -e 's|-m32|%{optflags}|' -e 's|-O3|%{optflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i -e 's|-m32|%{myoptflags}|' -e 's|-O3|%{myoptflags}|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|BUILD_SCRIPTGEN TRUE|BUILD_SCRIPTGEN FALSE|' %{name}/CMakeLists.txt
@@ -145,8 +151,8 @@ sed -i '/rpath/d' CMakeLists.txt
 mkdir -p build.release
 pushd build.release
    %cmake -DCMAKE_BUILD_TYPE=RELEASE         \
-          -DCMAKE_CXX_FLAGS="%{optflags}"    \
-          -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG" \
+          -DCMAKE_CXX_FLAGS="%{myoptflags}"    \
+          -DCMAKE_CXX_FLAGS_RELEASE="%{myoptflags} -std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG" \
           ..
 #   make PREFIX=/usr lupdate %{?_smp_flags}
    make PREFIX=/usr lrelease %{?_smp_flags}
@@ -296,6 +302,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/appdata/%{fontfamilyname}.metainfo.xml
 
 %changelog
+* Sat Apr 25 2015 Tom Callaway <spot at fedoraproject.org> - 2.0.0-2
+- add BR: doxygen
+- add -fsigned-char for ARM
+
 * Sat Apr 25 2015 Igor Gnatenko <ignatenkobrain at fedoraproject.org> - 2.0.0-1
 - Remove mp3 support to fix FTBFS
 - Add pulseaudio-libs-devel to BR
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mscore.git/commit/?h=master&id=79012e95492adbe4946dd0682958bd9cf265f520


More information about the scm-commits mailing list