rpms/mscore/F-11 mscore-ConvertFont.ff, NONE, 1.1 mscore.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 mscore-separate-commonfiles.patch, 1.1, 1.2 mscore-use-default-soundfont.patch, 1.1, 1.2 mscore-use-pclite-soundfont.patch, 1.1, 1.2 mscore.spec, 1.2, 1.3 sources, 1.2, 1.3
Orcan Ogetbil
oget at fedoraproject.org
Sat Aug 22 01:23:50 UTC 2009
- Previous message (by thread): rpms/rakudo/devel .cvsignore, 1.3, 1.4 import.log, 1.4, 1.5 rakudo.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message (by thread): rpms/mscore/F-10 mscore-ConvertFont.ff, NONE, 1.1 mscore.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 mscore-separate-commonfiles.patch, 1.1, 1.2 mscore-use-default-soundfont.patch, 1.1, 1.2 mscore-use-pclite-soundfont.patch, 1.1, 1.2 mscore.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: oget
Update of /cvs/pkgs/rpms/mscore/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18479
Modified Files:
.cvsignore mscore-separate-commonfiles.patch
mscore-use-default-soundfont.patch
mscore-use-pclite-soundfont.patch mscore.spec sources
Added Files:
mscore-ConvertFont.ff mscore.xml
Log Message:
* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
- Update to 0.9.5
--- NEW FILE mscore-ConvertFont.ff ---
#!/usr/bin/fontforge
if ($argc > 1)
i = 1;
while ( i < $argc )
Open($argv[i])
ttfile = "mscore-" + $fontname + ".ttf"
Print("Converting ",ttfile)
Generate(ttfile,"ttf")
Close()
i++
endloop
else
Print("Usage: $0 font.sfd [font.sfd ...]")
endif
--- NEW FILE mscore.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-musescore">
<comment>MuseScore file</comment>
<glob pattern="*.msc"/>
<glob pattern="*.mscx"/>
<glob pattern="*.mscz"/>
</mime-type>
</mime-info>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 23 Mar 2009 23:19:46 -0000 1.2
+++ .cvsignore 22 Aug 2009 01:23:50 -0000 1.3
@@ -1 +1 @@
-mscore-0.9.4-free.tar.bz2
+mscore-0.9.5-free.tar.bz2
mscore-separate-commonfiles.patch:
mscore.cpp | 6 +++---
mscore.qrc | 16 ++++++++--------
preferences.cpp | 12 ++++++------
3 files changed, 17 insertions(+), 17 deletions(-)
Index: mscore-separate-commonfiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore-separate-commonfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-separate-commonfiles.patch 23 Mar 2009 23:19:47 -0000 1.1
+++ mscore-separate-commonfiles.patch 22 Aug 2009 01:23:50 -0000 1.2
@@ -1,10 +1,10 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.cpp mscore-0.9.4/mscore/mscore/mscore.cpp
---- mscore-0.9.4.old/mscore/mscore/mscore.cpp 2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.cpp 2009-02-21 13:10:15.000000000 -0500
-@@ -1576,12 +1576,12 @@ int main(int argc, char* argv[])
- //
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.cpp mscore-0.9.5/mscore/mscore/mscore.cpp
+--- mscore-0.9.5.old/mscore/mscore/mscore.cpp 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.cpp 2009-08-21 16:05:43.000000000 -0400
+@@ -1559,17 +1559,17 @@ int main(int argc, char* argv[])
// load internal fonts
//
+
- if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore-20.ttf")) {
+ if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-20.ttf")) {
fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
@@ -16,9 +16,15 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
if (!debugMode)
exit(-1);
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc 2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc 2009-02-21 13:06:05.000000000 -0500
+ }
+- if (-1 == QFontDatabase::addApplicationFont(":/fonts/MuseJazz.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-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc 2009-08-21 12:50:24.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc 2009-08-21 16:05:43.000000000 -0400
@@ -2,9 +2,9 @@
<RCC version="1.0">
<qresource>
@@ -32,26 +38,28 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
<file>data/text_bold.svg</file>
<file>data/text_italic.svg</file>
<file>data/text_left.svg</file>
-@@ -29,11 +29,11 @@
+@@ -29,12 +29,12 @@
<file>data/viewmag.xpm</file>
<file>data/subscript.svg</file>
<file>data/superscript.svg</file>
- <file alias="fonts/mscore-20.ttf">fonts/mscore-20.ttf</file>
- <file alias="fonts/mscore1-20.ttf">fonts/mscore1-20.ttf</file>
+- <file>fonts/MuseJazz.ttf</file>
- <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
+
+
+
++
<file>data/splash.jpg</file>
-- <file alias="data/demo.msc">../demos/promenade.msc</file>
+- <file alias="data/demo.mscx">../demos/promenade.mscx</file>
+
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp 2009-02-21 12:56:04.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp 2009-02-21 13:34:13.000000000 -0500
-@@ -122,7 +122,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp 2009-08-21 16:06:54.000000000 -0400
+@@ -129,7 +129,7 @@ void Preferences::init()
bgUseColor = true;
fgUseColor = false;
bgWallpaper = QString();
@@ -60,16 +68,16 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
fgColor.setRgb(50, 50, 50);
bgColor.setRgb(0x76, 0x76, 0x6e);
-@@ -163,7 +163,7 @@ void Preferences::init()
+@@ -169,7 +169,7 @@ void Preferences::init()
layoutBreakColor = Qt::green;
antialiasedDrawing = true;
sessionStart = SCORE_SESSION;
-- startScore = ":/data/demo.msc";
-+ startScore = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc";
- workingDirectory = ".";
- lastSaveDirectory = ".";
- lastSaveCopyDirectory = ".";
-@@ -185,7 +185,7 @@ void Preferences::init()
+- startScore = ":/data/demo.mscx";
++ startScore = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx";
+ workingDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+ showSplashScreen = true;
+
+@@ -189,7 +189,7 @@ void Preferences::init()
midiExpandRepeats = true;
playRepeats = true;
@@ -78,13 +86,22 @@ diff -rupN mscore-0.9.4.old/mscore/mscor
alternateNoteEntryMethod = false;
useMidiOutput = false;
-@@ -403,8 +403,8 @@ void Preferences::read()
+@@ -328,7 +328,7 @@ void Preferences::read()
+ bgUseColor = s.value("bgUseColor", true).toBool();
+ fgUseColor = s.value("fgUseColor", false).toBool();
+ bgWallpaper = s.value("bgWallpaper").toString();
+- fgWallpaper = s.value("fgWallpaper", ":/data/paper3.png").toString();
++ fgWallpaper = s.value("fgWallpaper", INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png").toString();
+ fgColor = s.value("fgColor", QColor(50,50,50)).value<QColor>();
+ bgColor = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value<QColor>();
+
+@@ -412,8 +412,8 @@ void Preferences::read()
else if (ss == "empty")
sessionStart = EMPTY_SESSION;
-- startScore = s.value("startScore", ":/data/demo.msc").toString();
+- startScore = s.value("startScore", ":/data/demo.mscx").toString();
- instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
-+ startScore = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc").toString();
++ startScore = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx").toString();
+ instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
s.beginGroup("PlayPanel");
mscore-use-default-soundfont.patch:
mscore.qrc | 2 +-
preferences.cpp | 4 ++--
seq.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore-use-default-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-default-soundfont.patch 23 Mar 2009 23:19:47 -0000 1.1
+++ mscore-use-default-soundfont.patch 22 Aug 2009 01:23:50 -0000 1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp 2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp 2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
- p = QString(getenv("DEFAULT_SOUNDFONT"));
- if (p.isEmpty()) {
- //
-- // fallback to integrated soundfont
-+ // fallback to default soundfont
- //
-- p = ":/data/piano1.sf2";
-+ p = INSTPREFIX "/share/soundfonts/default.sf2";
- }
- bool rv = loadSoundFont(p);
- if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc 2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc 2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc 2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
<file alias="data/instruments.xml">../share/templates/instruments.xml</file>
<file>data/splash.jpg</file>
- <file alias="data/demo.msc">../demos/promenade.msc</file>
+ <file alias="data/demo.mscx">../demos/promenade.mscx</file>
- <file>data/piano1.sf2</file>
+
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
<file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp 2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp 2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp 2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+
enableMidiInput = true;
playNotes = true;
-
--#ifdef USE_GLOBAL_FLUID
-- soundFont = INSTPREFIX "/piano1.sf2";
--#else
- soundFont = ":/data/piano1.sf2";
--#endif
+ soundFont = INSTPREFIX "/share/soundfonts/default.sf2";
lPort = "";
rPort = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
lPort = s.value("lPort").toString();
rPort = s.value("rPort").toString();
--#ifdef USE_GLOBAL_FLUID
-- soundFont = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
- soundFont = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
+ soundFont = s.value("soundFont", INSTPREFIX "/share/soundfonts/default.sf2").toString();
-+
showNavigator = s.value("showNavigator", true).toBool();
showStatusBar = s.value("showStatusBar", true).toBool();
showPlayPanel = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp 2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+ p = QString(getenv("DEFAULT_SOUNDFONT"));
+ if (p.isEmpty()) {
+ //
+- // fallback to integrated soundfont
++ // fallback to default soundfont
+ //
+- p = ":/data/piano1.sf2";
++ p = INSTPREFIX "/share/soundfonts/default.sf2";
+ }
+ if (debugMode)
+ printf("load soundfont <%s>\n", qPrintable(p));
mscore-use-pclite-soundfont.patch:
mscore.qrc | 2 +-
preferences.cpp | 4 ++--
seq.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
Index: mscore-use-pclite-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore-use-pclite-soundfont.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-use-pclite-soundfont.patch 12 Jun 2009 01:05:22 -0000 1.1
+++ mscore-use-pclite-soundfont.patch 22 Aug 2009 01:23:50 -0000 1.2
@@ -1,57 +1,48 @@
-diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
---- mscore-0.9.4.old/mscore/mscore/fluid.cpp 2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/fluid.cpp 2009-02-20 22:39:16.000000000 -0500
-@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
- p = QString(getenv("DEFAULT_SOUNDFONT"));
- if (p.isEmpty()) {
- //
-- // fallback to integrated soundfont
-+ // fallback to default soundfont
- //
-- p = ":/data/piano1.sf2";
-+ p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
- }
- bool rv = loadSoundFont(p);
- if (!rv) {
-diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
---- mscore-0.9.4.old/mscore/mscore/mscore.qrc 2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/mscore.qrc 2009-02-20 22:41:59.000000000 -0500
-@@ -34,7 +34,7 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
+--- mscore-0.9.5.old/mscore/mscore/mscore.qrc 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc 2009-08-21 12:40:12.000000000 -0400
+@@ -35,7 +35,7 @@
<file alias="data/instruments.xml">../share/templates/instruments.xml</file>
<file>data/splash.jpg</file>
- <file alias="data/demo.msc">../demos/promenade.msc</file>
+ <file alias="data/demo.mscx">../demos/promenade.mscx</file>
- <file>data/piano1.sf2</file>
+
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
<file>data/undo.svg</file>
-diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
---- mscore-0.9.4.old/mscore/mscore/preferences.cpp 2009-02-06 05:33:28.000000000 -0500
-+++ mscore-0.9.4/mscore/mscore/preferences.cpp 2009-02-20 22:40:42.000000000 -0500
-@@ -136,11 +136,7 @@ void Preferences::init()
+diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
+--- mscore-0.9.5.old/mscore/mscore/preferences.cpp 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp 2009-08-21 12:41:51.000000000 -0400
+@@ -142,7 +142,7 @@ void Preferences::init()
+
enableMidiInput = true;
playNotes = true;
-
--#ifdef USE_GLOBAL_FLUID
-- soundFont = INSTPREFIX "/piano1.sf2";
--#else
- soundFont = ":/data/piano1.sf2";
--#endif
+ soundFont = INSTPREFIX "/share/soundfonts/PCLite.sf2";
lPort = "";
rPort = "";
-@@ -342,11 +338,8 @@ void Preferences::read()
+@@ -344,7 +344,7 @@ void Preferences::read()
lPort = s.value("lPort").toString();
rPort = s.value("rPort").toString();
--#ifdef USE_GLOBAL_FLUID
-- soundFont = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
--#else
- soundFont = s.value("soundFont", ":/data/piano1.sf2").toString();
--#endif
+ soundFont = s.value("soundFont", INSTPREFIX "/share/soundfonts/PCLite.sf2").toString();
-+
showNavigator = s.value("showNavigator", true).toBool();
showStatusBar = s.value("showStatusBar", true).toBool();
showPlayPanel = s.value("showPlayPanel", false).toBool();
+diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
+--- mscore-0.9.5.old/mscore/mscore/seq.cpp 2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp 2009-08-21 12:38:37.000000000 -0400
+@@ -221,9 +221,9 @@ bool Seq::init()
+ p = QString(getenv("DEFAULT_SOUNDFONT"));
+ if (p.isEmpty()) {
+ //
+- // fallback to integrated soundfont
++ // fallback to default soundfont
+ //
+- p = ":/data/piano1.sf2";
++ p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
+ }
+ if (debugMode)
+ printf("load soundfont <%s>\n", qPrintable(p));
Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/mscore.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mscore.spec 12 Jun 2009 01:05:22 -0000 1.2
+++ mscore.spec 22 Aug 2009 01:23:50 -0000 1.3
@@ -8,8 +8,8 @@
Name: mscore
Summary: Music Composition & Notation Software
-Version: 0.9.4
-Release: 4%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
# rtf2html is LGPLv2+
# paper4.png paper5.png are LGPLv3
# the rest is GPLv2
@@ -18,11 +18,15 @@ 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://downloads.sourceforge.net/mscore/mscore-0.9.4.tar.bz2
-# tar jxf mscore-*.tar.bz2
+# wget http://downloads.sourceforge.net/mscore/MuseScore-0.9.5.tar.bz2
+# tar jxf MuseScore-*.tar.bz2
# rm -f mscore-*/mscore/mscore/data/piano1.sf2
-# tar jcf mscore-0.9.4-free.tar.bz2 mscore-0.9.4/
+# tar jcf mscore-0.9.5-free.tar.bz2 mscore-0.9.5/
Source0: %{name}-%{version}-free.tar.bz2
+# For building the jazz font
+Source1: %{name}-ConvertFont.ff
+# For mime types
+Source2: %{name}.xml
# The upstream provides a stipped down version of AWL plugin for qtdesigner.
# We don't really need to package this. The full version of AWL plugin
# will be part of the upcoming muse2.
@@ -42,7 +46,6 @@ BuildRoot: %{_tmppath}/%{name}-%{ver
BuildRequires: alsa-lib-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: portaudio-devel
BuildRequires: qt4-devel
@@ -58,6 +61,11 @@ BuildRequires: tex-cm-lgc
BuildRequires: tetex-font-cm-lgc
%endif
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} >= 12
+BuildRequires: libsndfile-devel >= 1.0.19
+%endif
+
# fontpackages-1.21 has different behavior
%if 0%{?fedora} >= 12
Requires: %{name}-fonts = %{version}-%{release}
@@ -65,8 +73,8 @@ Requires: %{name}-fonts = %{version
Requires: %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
%endif
-# Doxygen documentation is useless. Hence we don't build it for now.
-# Otherwise it needs:
+# Doxygen documentation is huge and it is for musescore development only.
+# Hence we don't build it for now. Otherwise it needs:
# BuildRequires: graphviz doxygen texlive-latex texlive-dvips
# On Fedora < 11 there is no default soundfont
@@ -76,7 +84,10 @@ Requires: soundfont2-default
Requires: PersonalCopy-Lite-soundfont
%endif
-Provides: musescore = %{name}-%{version}
+# For scripting
+Requires: qtscriptbindings
+
+Provides: musescore = %{name}-%{version}-%{release}
%description
MuseScore is a free cross platform WYSIWYG music notation program. Some
@@ -94,10 +105,11 @@ highlights:
%package %{fontpackagename}
Summary: MuseScore fonts
Group: User Interface/X
-License: GPL+ with exceptions
+License: GPL+ with exceptions and OFL
Requires: fontpackages-filesystem
%if "%{fontpackagename}" == "fonts"
-Obsoletes: mscore-mscore-fonts < 0.9.4-4
+# Note: this line should be updated carefully on each update:
+Obsoletes: mscore-mscore-fonts < 0.9.5-1
Provides: mscore-mscore-fonts = %{version}-%{release}
%endif
@@ -124,12 +136,8 @@ rm mscore/rtf2html/rtf2html
find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
-# Use global fluidsynth instead of the bundled one:
-sed -i 's|USE_GLOBAL_FLUID FALSE|USE_GLOBAL_FLUID TRUE|' %{name}/CMakeLists.txt
-
# Do not build the bundled qt scripting interface:
-sed -i 's|BUILD_SCRIPT_INTERFACE TRUE|BUILD_SCRIPT_INTERFACE FALSE|' %{name}/CMakeLists.txt
-sed -i 's|BUILD_SCRIPT_DEBUG TRUE|BUILD_SCRIPT_DEBUG FALSE|' %{name}/CMakeLists.txt
+sed -i 's|scriptgen||' %{name}/CMakeLists.txt
# Fix EOL encoding
sed 's|\r||' %{name}/rtf2html/README > tmpfile
@@ -142,6 +150,17 @@ sed -i 's|relStaff %%d, %%d|relStaff %%d
# Remove preshipped fonts. We will build them from source
rm -f %{name}/%{name}/fonts/*.ttf
+# Fix GenericName
+sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
+
+# Fedora 10&11's libsndfile is too old :(
+%if 0%{?fedora} < 12
+sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
+%endif
+
+# Disable rpath
+sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
+
%build
# Build the actual program
mkdir build
@@ -156,6 +175,7 @@ popd
# Build fonts from source:
pushd %{name}/%{name}/fonts
./genFont
+ fontforge %{SOURCE1} MuseJazz.sfd
popd
%install
@@ -166,13 +186,30 @@ make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}/%{_fontdir}
install -pm 644 %{name}/%{name}/fonts/%{fontfamilyname}*.ttf %{buildroot}/%{_fontdir}
+# Mime type
+mkdir -p %{buildroot}/%{_datadir}/mime/packages
+install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/mime/packages/
+
# Desktop file
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-install \
+ --dir=%{buildroot}/%{_datadir}/applications \
+ --add-category="X-Notation" \
+ --remove-category="Sequencer" \
+ --remove-category="AudioVideoEditing" \
+ --add-mime-type="audio/midi" \
+ --add-mime-type="text/x-lilypond" \
+ --add-mime-type="application/xml" \
+ %{buildroot}/%{_datadir}/applications/%{name}.desktop
# Move images to the freedesktop location
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/apps/
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{32x32,64x64}/mimetypes/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
+ %{buildroot}/%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-musescore.xpm
mv %{buildroot}/%{_datadir}/pixmaps/%{name}.xpm \
%{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+cp -a %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
+ %{buildroot}/%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-musescore.png
mv %{buildroot}/%{_datadir}/pixmaps/%{name}.png \
%{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/
@@ -196,19 +233,24 @@ pushd %{name}
popd
%check
-# The tests seem outdated. Skipping.
+# iotest seems outdated. Skipping.
+# rendertest needs the X server. Skipping.
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -221,6 +263,7 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/%{name}%{?majorver}
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
%{_mandir}/man1/*
# fontpackages-1.21 has different behavior
@@ -231,6 +274,15 @@ gtk-update-icon-cache %{_datadir}/icons/
%endif
%changelog
+* Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
+- Update to 0.9.5
+
+* Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-6
+- Update the .desktop file
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Thu Jun 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.4-4
- Font package cleanup for F-12 (RHBZ#493463)
- One specfile for all releases
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 23 Mar 2009 23:19:47 -0000 1.2
+++ sources 22 Aug 2009 01:23:50 -0000 1.3
@@ -1 +1 @@
-69dd95b38a848b4f4ce4a4c47a7030ea mscore-0.9.4-free.tar.bz2
+389c64a782e41376eaa541d5cc47e400 mscore-0.9.5-free.tar.bz2
- Previous message (by thread): rpms/rakudo/devel .cvsignore, 1.3, 1.4 import.log, 1.4, 1.5 rakudo.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message (by thread): rpms/mscore/F-10 mscore-ConvertFont.ff, NONE, 1.1 mscore.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 mscore-separate-commonfiles.patch, 1.1, 1.2 mscore-use-default-soundfont.patch, 1.1, 1.2 mscore-use-pclite-soundfont.patch, 1.1, 1.2 mscore.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list