[mscore] Update to 1.2.
Orcan Ogetbil
oget at fedoraproject.org
Thu Mar 15 03:04:25 UTC 2012
commit c699f4808b3669478820d478780263a932750121
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Wed Mar 14 23:04:22 2012 -0400
Update to 1.2.
.gitignore | 1 +
mscore-ConvertFont.ff | 14 -----------
mscore-arm-buildfix.patch | 38 -----------------------------
mscore-fix-gcc-warnings.patch | 20 +++------------
mscore-gcc46.patch | 12 ---------
mscore-separate-commonfiles.patch | 40 +++++++++++++++++--------------
mscore-system-qtsingleapplication.patch | 36 ++++++++++++++--------------
mscore-use-default-soundfont.patch | 38 ++++++++++++++--------------
mscore.spec | 38 ++++++++++++-----------------
sources | 2 +-
10 files changed, 81 insertions(+), 158 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00bd64f..f31eaf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ mscore-0.9.6.2-free.tar.bz2
/mscore-0.9.6.3-free.tar.bz2
/mscore-1.0-free.tar.bz2
/mscore-1.1-free.tar.bz2
+/mscore-1.2-free.tar.bz2
diff --git a/mscore-fix-gcc-warnings.patch b/mscore-fix-gcc-warnings.patch
index f96dcec..a122d71 100644
--- a/mscore-fix-gcc-warnings.patch
+++ b/mscore-fix-gcc-warnings.patch
@@ -1,7 +1,7 @@
-diff -rupN mscore-0.9.6.old/mscore/mscore/capella.cpp mscore-0.9.6/mscore/mscore/capella.cpp
---- mscore-0.9.6.old/mscore/mscore/capella.cpp 2010-06-07 17:26:55.000000000 -0400
-+++ mscore-0.9.6/mscore/mscore/capella.cpp 2010-06-14 22:48:05.000000000 -0400
-@@ -115,7 +115,7 @@ void SimpleTextObj::read()
+diff -rupN mscore-1.2.old/mscore/mscore/capella.cpp mscore-1.2/mscore/mscore/capella.cpp
+--- mscore-1.2.old/mscore/mscore/capella.cpp 2012-03-13 09:32:27.000000000 -0400
++++ mscore-1.2/mscore/mscore/capella.cpp 2012-03-13 20:58:33.969062225 -0400
+@@ -116,7 +116,7 @@ void SimpleTextObj::read()
align = cap->readByte();
_font = cap->readFont();
_text = cap->readString();
@@ -10,15 +10,3 @@ diff -rupN mscore-0.9.6.old/mscore/mscore/capella.cpp mscore-0.9.6/mscore/mscore
relPos.x(), relPos.y(), strlen(_text), _text, _text[0]);
}
-diff -rupN mscore-0.9.6.old/mscore/mscore/importxml.cpp mscore-0.9.6/mscore/mscore/importxml.cpp
---- mscore-0.9.6.old/mscore/mscore/importxml.cpp 2010-06-07 17:26:55.000000000 -0400
-+++ mscore-0.9.6/mscore/mscore/importxml.cpp 2010-06-14 22:47:46.000000000 -0400
-@@ -2616,7 +2616,7 @@ void MusicXml::xmlNote(Measure* measure,
- } // for (int s ...
- if (!found) {
- if (voicelist[relStaff].size() >= unsigned(VOICES))
-- printf("ImportMusicXml: too many voices (staff %d, relStaff %d, %d >= %d)\n",
-+ printf("ImportMusicXml: too many voices (staff %d, relStaff %d, %zd >= %d)\n",
- staff, relStaff, voicelist[relStaff].size(), VOICES);
- else {
- voicelist[relStaff].push_back(voice);
diff --git a/mscore-separate-commonfiles.patch b/mscore-separate-commonfiles.patch
index c1b5e2e..23e5934 100644
--- a/mscore-separate-commonfiles.patch
+++ b/mscore-separate-commonfiles.patch
@@ -1,7 +1,7 @@
-diff -rupN mscore-1.1.old/mscore/mscore/mscore.cpp mscore-1.1/mscore/mscore/mscore.cpp
---- mscore-1.1.old/mscore/mscore/mscore.cpp 2011-07-28 22:00:11.000000000 -0400
-+++ mscore-1.1/mscore/mscore/mscore.cpp 2011-07-28 22:01:23.000000000 -0400
-@@ -1906,17 +1906,17 @@ int main(int argc, char* av[])
+diff -rupN mscore-1.2.old/mscore/mscore/mscore.cpp mscore-1.2/mscore/mscore/mscore.cpp
+--- mscore-1.2.old/mscore/mscore/mscore.cpp 2012-03-13 22:39:06.054220546 -0400
++++ mscore-1.2/mscore/mscore/mscore.cpp 2012-03-13 22:39:54.756984549 -0400
+@@ -1914,17 +1914,17 @@ int main(int argc, char* av[])
// load internal fonts
//
@@ -18,13 +18,13 @@ diff -rupN mscore-1.1.old/mscore/mscore/mscore.cpp mscore-1.1/mscore/mscore/msco
exit(-1);
}
- if (-1 == QFontDatabase::addApplicationFont(":/fonts/MuseJazz.ttf")) {
-+ if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz-Medium.ttf")) {
++ if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz.ttf")) {
fprintf(stderr, "Mscore: fatal error: cannot load internal font MuseJazz.ttf\n");
if (!debugMode)
exit(-1);
-diff -rupN mscore-1.1.old/mscore/mscore/mscore.qrc mscore-1.1/mscore/mscore/mscore.qrc
---- mscore-1.1.old/mscore/mscore/mscore.qrc 2011-07-27 09:32:43.000000000 -0400
-+++ mscore-1.1/mscore/mscore/mscore.qrc 2011-07-28 22:02:05.000000000 -0400
+diff -rupN mscore-1.2.old/mscore/mscore/mscore.qrc mscore-1.2/mscore/mscore/mscore.qrc
+--- mscore-1.2.old/mscore/mscore/mscore.qrc 2012-03-13 09:32:27.000000000 -0400
++++ mscore-1.2/mscore/mscore/mscore.qrc 2012-03-13 22:39:01.036244851 -0400
@@ -5,11 +5,11 @@
<file>data/previous.png</file>
<file>data/next.png</file>
@@ -55,14 +55,14 @@ diff -rupN mscore-1.1.old/mscore/mscore/mscore.qrc mscore-1.1/mscore/mscore/msco
+
+
<file>data/splash.jpg</file>
-- <file alias="data/Promenade_Example.mscx">../demos/promenade.mscx</file>
+- <file alias="data/Reunion_Example.mscz">../demos/Reunion.mscz</file>
+
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
<file>data/undo.svg</file>
-diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore/preferences.cpp
---- mscore-1.1.old/mscore/mscore/preferences.cpp 2011-07-28 22:00:11.000000000 -0400
-+++ mscore-1.1/mscore/mscore/preferences.cpp 2011-07-28 22:04:20.000000000 -0400
+diff -rupN mscore-1.2.old/mscore/mscore/preferences.cpp mscore-1.2/mscore/mscore/preferences.cpp
+--- mscore-1.2.old/mscore/mscore/preferences.cpp 2012-03-13 22:39:06.056220537 -0400
++++ mscore-1.2/mscore/mscore/preferences.cpp 2012-03-13 22:39:01.043244818 -0400
@@ -115,7 +115,7 @@ void Preferences::init()
bgUseColor = true;
fgUseColor = false;
@@ -76,8 +76,8 @@ diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore
layoutBreakColor = Qt::green;
antialiasedDrawing = true;
sessionStart = SCORE_SESSION;
-- startScore = ":/data/Promenade_Example.mscx";
-+ startScore = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx";
+- startScore = ":/data/Reunion_Example.mscz";
++ startScore = INSTPREFIX "/share/" INSTALL_NAME "demos/Reunion.mscz";
workingDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
showSplashScreen = true;
@@ -90,7 +90,7 @@ diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore
alternateNoteEntryMethod = false;
proximity = 6;
-@@ -345,7 +345,7 @@ void Preferences::read()
+@@ -350,7 +350,7 @@ void Preferences::read()
bgUseColor = s.value("bgUseColor", true).toBool();
fgUseColor = s.value("fgUseColor", false).toBool();
bgWallpaper = s.value("bgWallpaper").toString();
@@ -99,13 +99,17 @@ diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore
fgColor = s.value("fgColor", QColor(255, 255, 255)).value<QColor>();
bgColor = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value<QColor>();
-@@ -449,8 +449,8 @@ void Preferences::read()
+@@ -455,10 +455,10 @@ void Preferences::read()
else if (ss == "empty")
sessionStart = EMPTY_SESSION;
-- startScore = s.value("startScore", ":/data/Promenade_Example.mscx").toString();
+- startScore = s.value("startScore", ":/data/Reunion_Example.mscz").toString();
+- if(startScore == ":/data/Promenade_Example.mscx")
+- startScore = ":/data/Reunion_Example.mscz";
- instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
-+ startScore = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx").toString();
++ startScore = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/Reunion.mscz").toString();
++ if(startScore == INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx")
++ startScore = INSTPREFIX "/share/" INSTALL_NAME "demos/Reunion.mscz";
+ instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
readShortcuts();
diff --git a/mscore-system-qtsingleapplication.patch b/mscore-system-qtsingleapplication.patch
index 7d305aa..c467e21 100644
--- a/mscore-system-qtsingleapplication.patch
+++ b/mscore-system-qtsingleapplication.patch
@@ -1,7 +1,7 @@
-diff -rupN mscore-1.0.old/mscore/CMakeLists.txt mscore-1.0/mscore/CMakeLists.txt
---- mscore-1.0.old/mscore/CMakeLists.txt 2011-02-04 16:13:45.000000000 -0500
-+++ mscore-1.0/mscore/CMakeLists.txt 2011-02-08 23:18:48.000000000 -0500
-@@ -55,6 +55,8 @@ if (APPLE)
+diff -rupN mscore-1.2.old/mscore/CMakeLists.txt mscore-1.2/mscore/CMakeLists.txt
+--- mscore-1.2.old/mscore/CMakeLists.txt 2012-03-13 09:37:09.000000000 -0400
++++ mscore-1.2/mscore/CMakeLists.txt 2012-03-13 21:03:47.093427409 -0400
+@@ -64,6 +64,8 @@ if (APPLE)
set(OsxFrameworks ${AudioToolboxFW} ${AudioUnitFW} ${CoreAudioFW} ${CoreMidiFW} ${SystemConfigurationFW} ${CoreServicesFW})
endif (APPLE)
@@ -10,10 +10,10 @@ diff -rupN mscore-1.0.old/mscore/CMakeLists.txt mscore-1.0/mscore/CMakeLists.txt
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-@@ -236,7 +238,16 @@ if (NOT MINGW AND NOT APPLE)
+@@ -305,7 +307,16 @@ if (NOT MINGW AND NOT APPLE)
endif (NOT MINGW AND NOT APPLE)
- set (subdirs al awl bww2mxml osdabzip rtf2html mscore share manual demos
+ subdirs (al awl bww2mxml osdabzip rtf2html mscore share manual demos
- singleapp fluid)
+ fluid)
+
@@ -21,17 +21,17 @@ diff -rupN mscore-1.0.old/mscore/CMakeLists.txt mscore-1.0/mscore/CMakeLists.txt
+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
+ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
+else(USE_SYSTEM_QTSINGLEAPPLICATION)
-+ set (subdirs ${subdirs} singleapp)
++ subdirs (singleapp)
+ set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)
+ set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapp)
+endif(USE_SYSTEM_QTSINGLEAPPLICATION)
if (BUILD_SCRIPTGEN)
- set (subdirs ${subdirs} scriptgen)
-diff -rupN mscore-1.0.old/mscore/mscore/CMakeLists.txt mscore-1.0/mscore/mscore/CMakeLists.txt
---- mscore-1.0.old/mscore/mscore/CMakeLists.txt 2011-02-08 23:16:27.000000000 -0500
-+++ mscore-1.0/mscore/mscore/CMakeLists.txt 2011-02-08 23:19:38.000000000 -0500
-@@ -67,6 +67,7 @@ include_directories(
+ subdirs (scriptgen)
+diff -rupN mscore-1.2.old/mscore/mscore/CMakeLists.txt mscore-1.2/mscore/mscore/CMakeLists.txt
+--- mscore-1.2.old/mscore/mscore/CMakeLists.txt 2012-03-13 21:13:46.278302004 -0400
++++ mscore-1.2/mscore/mscore/CMakeLists.txt 2012-03-13 21:08:55.224819711 -0400
+@@ -38,6 +38,7 @@ include_directories(
${PROJECT_SOURCE_DIR}/scriptdebug
${PROJECT_SOURCE_DIR}/osdabzip
${PROJECT_SOURCE_DIR}/fluid
@@ -39,7 +39,7 @@ diff -rupN mscore-1.0.old/mscore/mscore/CMakeLists.txt mscore-1.0/mscore/mscore/
${PROJECT_SOURCE_DIR}/bww2mxml
)
-@@ -234,7 +235,7 @@ if (MINGW)
+@@ -217,7 +218,7 @@ if (MINGW)
bww
osdabzip
rtf2html
@@ -48,7 +48,7 @@ diff -rupN mscore-1.0.old/mscore/mscore/CMakeLists.txt mscore-1.0/mscore/mscore/
${QT_mingw_LIBRARIES}
portaudio
portmidi
-@@ -286,7 +287,7 @@ else (MINGW)
+@@ -271,7 +272,7 @@ else (MINGW)
bww
osdabzip
rtf2html
@@ -57,10 +57,10 @@ diff -rupN mscore-1.0.old/mscore/mscore/CMakeLists.txt mscore-1.0/mscore/mscore/
fluid
z
dl
-diff -rupN mscore-1.0.old/mscore/mscore/mscore.h mscore-1.0/mscore/mscore/mscore.h
---- mscore-1.0.old/mscore/mscore/mscore.h 2011-02-04 16:13:12.000000000 -0500
-+++ mscore-1.0/mscore/mscore/mscore.h 2011-02-08 23:19:54.000000000 -0500
-@@ -25,7 +25,7 @@
+diff -rupN mscore-1.2.old/mscore/mscore/mscore.h mscore-1.2/mscore/mscore/mscore.h
+--- mscore-1.2.old/mscore/mscore/mscore.h 2012-03-13 09:32:27.000000000 -0400
++++ mscore-1.2/mscore/mscore/mscore.h 2012-03-13 21:05:04.665022579 -0400
+@@ -26,7 +26,7 @@
#include "ui_measuresdialog.h"
#include "ui_insertmeasuresdialog.h"
#include "ui_aboutbox.h"
diff --git a/mscore-use-default-soundfont.patch b/mscore-use-default-soundfont.patch
index b4c2daf..d40f768 100644
--- a/mscore-use-default-soundfont.patch
+++ b/mscore-use-default-soundfont.patch
@@ -1,26 +1,26 @@
-diff -rupN mscore-1.1.old/mscore/mscore/mscore.cpp mscore-1.1/mscore/mscore/mscore.cpp
---- mscore-1.1.old/mscore/mscore/mscore.cpp 2011-07-27 09:32:43.000000000 -0400
-+++ mscore-1.1/mscore/mscore/mscore.cpp 2011-07-28 21:54:28.000000000 -0400
-@@ -1883,7 +1883,7 @@ int main(int argc, char* av[])
+diff -rupN mscore-1.2.old/mscore/mscore/mscore.cpp mscore-1.2/mscore/mscore/mscore.cpp
+--- mscore-1.2.old/mscore/mscore/mscore.cpp 2012-03-13 09:32:27.000000000 -0400
++++ mscore-1.2/mscore/mscore/mscore.cpp 2012-03-13 20:02:36.567600415 -0400
+@@ -1890,7 +1890,7 @@ int main(int argc, char* av[])
if (!useFactorySettings)
preferences.read();
else {
- preferences.soundFont = mscoreGlobalShare+"sound/TimGM6mb.sf2";
+ preferences.soundFont = QString(INSTPREFIX "/share/soundfonts/default.sf2");
}
-
- QSplashScreen* sc = 0;
-@@ -3288,4 +3288,4 @@ void MuseScore::closeWebPanelPermanently
- showWebPanel(false);
- preferences.showWebPanel = false;
- preferences.dirty = true;
-- }
+ preferences.useOsc = useOsc;
+
+@@ -3302,4 +3302,4 @@ void MuseScore::closeScore(Score* score)
+ removeTab(scoreList.indexOf(score));
+ }
+
+-
\ No newline at end of file
-+ }
-diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore/preferences.cpp
---- mscore-1.1.old/mscore/mscore/preferences.cpp 2011-07-27 09:32:44.000000000 -0400
-+++ mscore-1.1/mscore/mscore/preferences.cpp 2011-07-28 21:56:37.000000000 -0400
-@@ -361,12 +361,8 @@ void Preferences::read()
++
+diff -rupN mscore-1.2.old/mscore/mscore/preferences.cpp mscore-1.2/mscore/mscore/preferences.cpp
+--- mscore-1.2.old/mscore/mscore/preferences.cpp 2012-03-13 09:32:27.000000000 -0400
++++ mscore-1.2/mscore/mscore/preferences.cpp 2012-03-13 20:03:29.356330044 -0400
+@@ -366,12 +366,8 @@ void Preferences::read()
playNotes = s.value("playNotes", true).toBool();
lPort = s.value("lPort").toString();
rPort = s.value("rPort").toString();
@@ -34,9 +34,9 @@ diff -rupN mscore-1.1.old/mscore/mscore/preferences.cpp mscore-1.1/mscore/mscore
showNavigator = s.value("showNavigator", true).toBool();
showStatusBar = s.value("showStatusBar", true).toBool();
showPlayPanel = s.value("showPlayPanel", false).toBool();
-diff -rupN mscore-1.1.old/mscore/share/sound/CMakeLists.txt mscore-1.1/mscore/share/sound/CMakeLists.txt
---- mscore-1.1.old/mscore/share/sound/CMakeLists.txt 2011-07-27 09:32:55.000000000 -0400
-+++ mscore-1.1/mscore/share/sound/CMakeLists.txt 2011-07-28 21:57:16.000000000 -0400
+diff -rupN mscore-1.2.old/mscore/share/sound/CMakeLists.txt mscore-1.2/mscore/share/sound/CMakeLists.txt
+--- mscore-1.2.old/mscore/share/sound/CMakeLists.txt 2012-03-13 09:33:02.000000000 -0400
++++ mscore-1.2/mscore/share/sound/CMakeLists.txt 2012-03-13 20:04:10.708118240 -0400
@@ -20,6 +20,6 @@
install(FILES
diff --git a/mscore.spec b/mscore.spec
index 4071678..f015cb2 100644
--- a/mscore.spec
+++ b/mscore.spec
@@ -2,8 +2,8 @@
Name: mscore
Summary: Music Composition & Notation Software
-Version: 1.1
-Release: 4%{?dist}
+Version: 1.2
+Release: 1%{?dist}
# rtf2html is LGPLv2+
# paper4.png paper5.png are LGPLv3
# the rest is GPLv2
@@ -12,13 +12,11 @@ Group: Applications/Multimedia
URL: http://musescore.org/en
# Upstream tarball contains a non-free soundfont "Gort's Minipiano"
# We generate our own tarball by removing this soundfont via:
-# wget http://download.sourceforge.net/mscore/mscore-1.1.tar.bz2
-# tar jxf mscore-1.1.tar.bz2
+# wget http://download.sourceforge.net/mscore/mscore-1.2.tar.bz2
+# tar jxf mscore-1.2.tar.bz2
# rm -f mscore-*/mscore/mscore/data/piano1.sf2
-# tar jcf mscore-1.1-free.tar.bz2 mscore-1.1/
+# tar jcf mscore-1.2-free.tar.bz2 mscore-1.2/
Source0: %{name}-%{version}-free.tar.bz2
-# For building the jazz font
-Source1: %{name}-ConvertFont.ff
# For mime types
Source2: %{name}.xml
# Use Fedora's default soundfont instead of the removed one:
@@ -30,9 +28,6 @@ Patch0: %{name}-use-default-soundfont.patch
Patch1: %{name}-separate-commonfiles.patch
# Split the large documentation into a separate package
Patch2: %{name}-split-doc.patch
-# qreal is float on arm. getY() expects double:
-# http://www.musescore.org/en/node/3726
-Patch3: %{name}-arm-buildfix.patch
# Fix some gcc warnings
Patch4: %{name}-fix-gcc-warnings.patch
# Fix DSO linking. Seems to have fixed in trunk, but misssing in the tarball
@@ -40,8 +35,6 @@ Patch4: %{name}-fix-gcc-warnings.patch
Patch5: %{name}-dso-linking.patch
# Use system qtsingleapplication
Patch6: %{name}-system-qtsingleapplication.patch
-# gcc-4.6 buid fix
-Patch7: %{name}-gcc46.patch
# Fix crash on Accidentals click RHBZ#738044 From upstream trunk rev 3193
Patch8: %{name}-fix-accidentals-crash.patch
@@ -49,7 +42,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libsndfile-devel >= 1.0.19
+BuildRequires: libsndfile-devel
BuildRequires: portaudio-devel
BuildRequires: qt4-devel
BuildRequires: qtsingleapplication-devel
@@ -102,9 +95,6 @@ BuildRequires: fontpackages-devel
BuildRequires: t1utils
BuildRequires: texlive
BuildRequires: tex-cm-lgc
-# Note: this line should be updated carefully on each update:
-Obsoletes: mscore-mscore-fonts < 0.9.5-2
-Provides: mscore-mscore-fonts = %{version}-%{release}
%description fonts
MuseScore is a free cross platform WYSIWYG music notation program.
@@ -117,21 +107,19 @@ This package contains the musical notation fonts for use of MuseScore.
%patch0 -p1 -b .default.soundfont
%patch1 -p1 -b .separatecommon
%patch2 -p1 -b .splitdoc
-%patch3 -p1 -b .arm
%patch4 -p1 -b .warnings
%patch5 -p1 -b .dso
%patch6 -p1 -b .qtsingleapp
-%patch7 -p1 -b .gcc46
%patch8 -p1 -b .accidentals
# Remove the precompiled binary
rm mscore/rtf2html/rtf2html
# Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i -e 's|-m32|%{optflags}|' -e 's|-O3|%{optflags}|' {} \;
# Do not build the bundled qt scripting interface:
-sed -i 's|scriptgen||' %{name}/CMakeLists.txt
+sed -i 's|BUILD_SCRIPTGEN TRUE|BUILD_SCRIPTGEN FALSE|' %{name}/CMakeLists.txt
# Fix EOL encoding
sed 's|\r||' %{name}/rtf2html/README > tmpfile
@@ -141,11 +129,14 @@ mv -f tmpfile %{name}/rtf2html/README
# Remove preshipped fonts. We will build them from source
rm -f %{name}/%{name}/fonts/*.ttf
+# Change font name according to our conventions
+sed -i 's|MuseJazz.ttf|%{fontfamilyname}-MuseJazz.ttf|' %{name}/%{name}/fonts/gen-jazz.pe
+
# Disable rpath
sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
# We don't use this 3rd party lib but remove anyways
-rm -fr mscore/singleapp/
+rm -fr mscore/singleapp/ mscore/scriptgen/
%build
# Build the actual program
@@ -164,7 +155,7 @@ popd
# Build fonts from source:
pushd %{name}/%{name}/fonts
./genFont
- fontforge %{SOURCE1} MuseJazz.sfd
+ fontforge gen-jazz.pe
popd
%install
@@ -260,6 +251,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Mar 13 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.2-1
+- Update to 1.2.
+
* Sat Mar 03 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1-4
- Fix accidontals crash RHBZ#738044
diff --git a/sources b/sources
index aab0988..485e7fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54b695773ef3efe818ec714b3074e682 mscore-1.1-free.tar.bz2
+ee90df0d3123ff59479c2df249027a78 mscore-1.2-free.tar.bz2
More information about the scm-commits
mailing list