rpms/mscore/F-13 mscore-dso-linking.patch, NONE, 1.1 mscore-fix-gcc-warnings.patch, NONE, 1.1 mscore-split-doc.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 mscore-arm-buildfix.patch, 1.1, 1.2 mscore-separate-commonfiles.patch, 1.2, 1.3 mscore-use-default-soundfont.patch, 1.3, 1.4 mscore.spec, 1.7, 1.8 sources, 1.3, 1.4 mscore-no-awl-plugin.patch, 1.1, NONE

Orcan Ogetbil oget at fedoraproject.org
Tue Jun 15 04:30:29 UTC 2010 

Author: oget

Update of /cvs/pkgs/rpms/mscore/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12354

Modified Files:
	.cvsignore mscore-arm-buildfix.patch 
	mscore-separate-commonfiles.patch 
	mscore-use-default-soundfont.patch mscore.spec sources 
Added Files:
	mscore-dso-linking.patch mscore-fix-gcc-warnings.patch 
	mscore-split-doc.patch 
Removed Files:
	mscore-no-awl-plugin.patch 
Log Message:
* Mon Jun 14 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.6-1
- Update to 0.9.6
- Split documentation into its own package
- Move some gcc warning fixes into a patch


mscore-dso-linking.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE mscore-dso-linking.patch ---
diff -rupN mscore-0.9.6.old/mscore/mscore/CMakeLists.txt mscore-0.9.6/mscore/mscore/CMakeLists.txt
--- mscore-0.9.6.old/mscore/mscore/CMakeLists.txt	2010-06-07 17:26:55.000000000 -0400
+++ mscore-0.9.6/mscore/mscore/CMakeLists.txt	2010-06-14 23:57:57.000000000 -0400
@@ -286,6 +286,8 @@ else (MINGW)
       qtsingleapp
       fluid
       z
+      dl
+      rt
       )
 
    if (HAS_AUDIOFILE)

mscore-fix-gcc-warnings.patch:
 capella.cpp   |    2 +-
 importxml.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mscore-fix-gcc-warnings.patch ---
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()
       align  = cap->readByte();
       _font  = cap->readFont();
       _text  = cap->readString();
-printf("read SimpletextObj(%d,%d) len %d <%s> char0: %02x\n",
+printf("read SimpletextObj(%d,%d) len %zd <%s> char0: %02x\n",
       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);

mscore-split-doc.patch:
 mscore.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mscore-split-doc.patch ---
diff -rupN mscore-0.9.6.old/mscore/mscore/mscore.cpp mscore-0.9.6/mscore/mscore/mscore.cpp
--- mscore-0.9.6.old/mscore/mscore/mscore.cpp	2010-06-07 17:26:55.000000000 -0400
+++ mscore-0.9.6/mscore/mscore/mscore.cpp	2010-06-14 22:19:19.000000000 -0400
@@ -907,7 +907,7 @@ void MuseScore::helpBrowser()
                 if (!mscoreHelp.isReadable()) {
                       QString info(tr("MuseScore handbook not found at: \n"));
                       info += mscoreHelp.filePath();
-                      info += tr("\n\nFrom the \"Help\" menu try choosing \"Online Handbook\" instead.");
+                      info += tr("\n\nEither install the \"mscore-doc\" package and try again, or\nfrom the \"Help\" menu try choosing \"Online Handbook\" instead.");
                       QMessageBox::critical(this, tr("MuseScore: Open Help"), info);
                       return;
                       }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Aug 2009 01:27:14 -0000	1.3
+++ .cvsignore	15 Jun 2010 04:30:28 -0000	1.4
@@ -1 +1 @@
-mscore-0.9.5-free.tar.bz2
+mscore-0.9.6-free.tar.bz2

mscore-arm-buildfix.patch:
 barline.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: mscore-arm-buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-13/mscore-arm-buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mscore-arm-buildfix.patch	24 Dec 2009 12:05:31 -0000	1.1
+++ mscore-arm-buildfix.patch	15 Jun 2010 04:30:29 -0000	1.2
@@ -1,38 +1,38 @@
---- mscore-0.9.5.old/mscore/mscore/barline.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/barline.cpp	2009-12-22 08:42:39.000000000 -0500
-@@ -96,7 +96,7 @@ void BarLine::draw(QPainter& p) const
+--- mscore-0.9.6.old/mscore/mscore/barline.cpp	2010-06-07 17:26:55.000000000 -0400
++++ mscore-0.9.6/mscore/mscore/barline.cpp	2010-06-12 00:20:33.000000000 -0400
+@@ -90,7 +90,7 @@ void BarLine::draw(QPainter& p) const
        {
-       qreal lw = point(score()->styleS(ST_barWidth));
-       qreal y1, y2;
+       double lw = point(score()->styleS(ST_barWidth));
+       double y1, y2;
 -      getY(&y1, &y2);
 +      getY((double*)&y1, (double*)&y2);
  
        QPen pen(p.pen());
        pen.setWidthF(lw);
-@@ -274,7 +274,7 @@ void BarLine::read(QDomElement e)
- QRectF BarLine::bbox() const
-       {
-       qreal y1, y2;
--      getY(&y1, &y2);
-+      getY((double*)&y1, (double*)&y2);
-       Spatium w = score()->styleS(ST_barWidth);
-       qreal dw  = 0.0;
- 
-@@ -366,7 +366,7 @@ void BarLine::updateGrips(int* grips, QR
+@@ -340,7 +340,7 @@ void BarLine::updateGrips(int* grips, QR
        *grips   = 1;
-       qreal lw = point(score()->styleS(ST_barWidth));
-       qreal y1, y2;
+       double lw = point(score()->styleS(ST_barWidth));
+       double y1, y2;
 -      getY(&y1, &y2);
 +      getY((double*)&y1, (double*)&y2);
        grip[0].translate(QPointF(lw * .5, y2) + canvasPos());
        }
  
-@@ -413,7 +413,7 @@ void BarLine::editDrag(int, const QPoint
+@@ -387,7 +387,7 @@ void BarLine::editDrag(int, const QPoint
  void BarLine::endEditDrag()
        {
        double y1, h2;
 -      getY(&y1, &h2);
 +      getY((double*)&y1, (double*)&h2);
        yoff      = 0.0;
-       qreal ay1 = canvasPos().y();
-       qreal ay2 = ay1 + h2;
+       double ay1 = canvasPos().y();
+       double ay2 = ay1 + h2;
+@@ -443,7 +443,7 @@ void BarLine::layout()
+       _span = staff() ? staff()->barLineSpan() : 1;
+ 
+       double y1, y2;
+-      getY(&y1, &y2);
++      getY((double*)&y1, (double*)&y2);
+       Spatium w = score()->styleS(ST_barWidth);
+       double dw  = 0.0;
+ 

mscore-separate-commonfiles.patch:
 mscore.cpp      |    6 +++---
 mscore.qrc      |   20 ++++++++++----------
 preferences.cpp |   12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

Index: mscore-separate-commonfiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-13/mscore-separate-commonfiles.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mscore-separate-commonfiles.patch	22 Aug 2009 01:27:15 -0000	1.2
+++ mscore-separate-commonfiles.patch	15 Jun 2010 04:30:29 -0000	1.3
@@ -1,7 +1,7 @@
-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[])
+diff -rupN mscore-0.9.6.old/mscore/mscore/mscore.cpp mscore-0.9.6/mscore/mscore/mscore.cpp
+--- mscore-0.9.6.old/mscore/mscore/mscore.cpp	2010-06-07 17:26:55.000000000 -0400
++++ mscore-0.9.6/mscore/mscore/mscore.cpp	2010-06-12 00:12:36.000000000 -0400
+@@ -1868,17 +1868,17 @@ int main(int argc, char* av[])
        //  load internal fonts
        //
  
@@ -22,28 +22,32 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
              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>
+diff -rupN mscore-0.9.6.old/mscore/mscore/mscore.qrc mscore-0.9.6/mscore/mscore/mscore.qrc
+--- mscore-0.9.6.old/mscore/mscore/mscore.qrc	2010-06-07 17:26:55.000000000 -0400
++++ mscore-0.9.6/mscore/mscore/mscore.qrc	2010-06-12 00:13:41.000000000 -0400
+@@ -5,11 +5,11 @@
+       <file>data/previous.png</file>
+       <file>data/next.png</file>
        <file>data/repeat.svg</file>
 -      <file>data/paper1.png</file>
 -      <file>data/paper2.png</file>
 -      <file>data/paper3.png</file>
+-      <file>data/paper4.png</file>
+-      <file>data/paper5.png</file>
++
++
 +
 +
 +
        <file>data/text_bold.svg</file>
        <file>data/text_italic.svg</file>
        <file>data/text_left.svg</file>
-@@ -29,12 +29,12 @@
+@@ -33,12 +33,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/mscore-20.ttf</file>
+-      <file>fonts/mscore1-20.ttf</file>
 -      <file>fonts/MuseJazz.ttf</file>
 -      <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
 +
@@ -53,22 +57,22 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        <file>data/splash.jpg</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.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()
+       <file>data/undo.svg</file>
+diff -rupN mscore-0.9.6.old/mscore/mscore/preferences.cpp mscore-0.9.6/mscore/mscore/preferences.cpp
+--- mscore-0.9.6.old/mscore/mscore/preferences.cpp	2010-06-07 17:26:55.000000000 -0400
++++ mscore-0.9.6/mscore/mscore/preferences.cpp	2010-06-12 00:17:10.000000000 -0400
+@@ -115,7 +115,7 @@ void Preferences::init()
        bgUseColor         = true;
        fgUseColor         = false;
        bgWallpaper        = QString();
--      fgWallpaper        = ":/data/paper3.png";
-+      fgWallpaper        = INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png";
-       fgColor.setRgb(50, 50, 50);
+-      fgWallpaper        = ":/data/paper5.png";
++      fgWallpaper        = INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper5.png";
+       fgColor.setRgb(255, 255, 255);
        bgColor.setRgb(0x76, 0x76, 0x6e);
  
-@@ -169,7 +169,7 @@ void Preferences::init()
+@@ -163,7 +163,7 @@ void Preferences::init()
        layoutBreakColor         = Qt::green;
        antialiasedDrawing       = true;
        sessionStart             = SCORE_SESSION;
@@ -77,7 +81,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        workingDirectory         = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
        showSplashScreen         = true;
  
-@@ -189,7 +189,7 @@ void Preferences::init()
+@@ -183,7 +183,7 @@ void Preferences::init()
  
        midiExpandRepeats        = true;
        playRepeats              = true;
@@ -85,17 +89,17 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
 +      instrumentList           = INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml";
  
        alternateNoteEntryMethod = false;
-       useMidiOutput            = false;
-@@ -328,7 +328,7 @@ void Preferences::read()
+       proximity                = 6;
+@@ -343,7 +343,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>();
+-      fgWallpaper     = s.value("fgWallpaper", ":/data/paper5.png").toString();
++      fgWallpaper     = s.value("fgWallpaper", INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper5.png").toString();
+       fgColor         = s.value("fgColor", QColor(255, 255, 255)).value<QColor>();
        bgColor         = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value<QColor>();
  
-@@ -412,8 +412,8 @@ void Preferences::read()
+@@ -448,8 +448,8 @@ void Preferences::read()
        else if (ss == "empty")
              sessionStart = EMPTY_SESSION;
  

mscore-use-default-soundfont.patch:
 mscore/mscore.cpp          |    2 +-
 mscore/preferences.cpp     |    4 ++--
 share/sound/CMakeLists.txt |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-13/mscore-use-default-soundfont.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mscore-use-default-soundfont.patch	24 Dec 2009 12:05:31 -0000	1.3
+++ mscore-use-default-soundfont.patch	15 Jun 2010 04:30:29 -0000	1.4
@@ -1,63 +1,39 @@
-diff -rupN mscore-0.9.5.old/mscore/mscore/exportaudio.cpp mscore-0.9.5/mscore/mscore/exportaudio.cpp
---- mscore-0.9.5.old/mscore/mscore/exportaudio.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/exportaudio.cpp	2009-12-22 08:17:53.000000000 -0500
-@@ -49,9 +49,9 @@ bool Score::saveAudio(const QString& nam
-             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";
+diff -rupN mscore-0.9.6.old/mscore/mscore/mscore.cpp mscore-0.9.6/mscore/mscore/mscore.cpp
+--- mscore-0.9.6.old/mscore/mscore/mscore.cpp	2010-06-07 17:26:55.000000000 -0400
++++ mscore-0.9.6/mscore/mscore/mscore.cpp	2010-06-14 20:44:00.000000000 -0400
+@@ -1845,7 +1845,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");
              }
-       bool rv = synth->loadSoundFont(p);
-       if (!rv) {
-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-12-22 08:15:49.000000000 -0500
-@@ -35,7 +35,7 @@
-       <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
-       <file>data/splash.jpg</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.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-12-22 08:15:49.000000000 -0500
-@@ -142,7 +142,7 @@ void Preferences::init()
  
-       enableMidiInput    = true;
-       playNotes          = true;
--      soundFont          = ":/data/piano1.sf2";
-+      soundFont          = INSTPREFIX "/share/soundfonts/default.sf2";
- 
-       lPort              = "";
-       rPort              = "";
-@@ -344,7 +344,7 @@ void Preferences::read()
+       QSplashScreen* sc = 0;
+diff -rupN mscore-0.9.6.old/mscore/mscore/preferences.cpp mscore-0.9.6/mscore/mscore/preferences.cpp
+--- mscore-0.9.6.old/mscore/mscore/preferences.cpp	2010-06-07 17:26:55.000000000 -0400
++++ mscore-0.9.6/mscore/mscore/preferences.cpp	2010-06-14 20:45:20.000000000 -0400
+@@ -360,10 +360,10 @@ void Preferences::read()
        lPort           = s.value("lPort").toString();
        rPort           = s.value("rPort").toString();
  
--      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
-+      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/default.sf2").toString();
+-      soundFont       = s.value("soundFont", mscoreGlobalShare+"/sound/TimGM6mb.sf2").toString();
++      soundFont       = s.value("soundFont", QString(INSTPREFIX "/share/soundfonts/default.sf2")).toString();
+       if (soundFont == ":/data/piano1.sf2") {
+             // silently change to new default sound font
+-            soundFont = mscoreGlobalShare + "/sound/TimGM6mb.sf2";
++	    soundFont = QString(INSTPREFIX "/share/soundfonts/default.sf2");
+             }
        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-12-22 08:15:49.000000000 -0500
-@@ -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));
+diff -rupN mscore-0.9.6.old/mscore/share/sound/CMakeLists.txt mscore-0.9.6/mscore/share/sound/CMakeLists.txt
+--- mscore-0.9.6.old/mscore/share/sound/CMakeLists.txt	2010-06-07 17:27:27.000000000 -0400
++++ mscore-0.9.6/mscore/share/sound/CMakeLists.txt	2010-06-14 20:46:18.000000000 -0400
+@@ -20,6 +20,6 @@
+ 
+ install(FILES
+       TimGM6mb.sf2
+-      DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}sound
++      DESTINATION ${Mscore_SHARE_NAME}/soundfonts
+       )
+ 


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-13/mscore.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mscore.spec	24 Dec 2009 12:39:00 -0000	1.7
+++ mscore.spec	15 Jun 2010 04:30:29 -0000	1.8
@@ -1,15 +1,10 @@
 %global fontfamilyname %{name}
 %global majorver -0.9
-%if 0%{?fedora} > 11
-%global buildflags %{optflags} -fno-var-tracking-assignments
-%else
-%global buildflags %{optflags}
-%endif
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
-Version:       0.9.5
-Release:       3%{?dist}
+Version:       0.9.6
+Release:       1%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -18,30 +13,32 @@ 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/MuseScore-0.9.5.tar.bz2
-#    tar jxf MuseScore-*.tar.bz2
+#    wget http://downloads.sourceforge.net/project/mscore/mscore/mscore-0.9.6/mscore-0.9.6.tar.bz2
+#    tar jxf mscore-0.9.6.tar.bz2
 #    rm -f mscore-*/mscore/mscore/data/piano1.sf2
-#    tar jcf mscore-0.9.5-free.tar.bz2 mscore-0.9.5/
+#    tar jcf mscore-0.9.6-free.tar.bz2 mscore-0.9.6/
 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.
-Patch1:        %{name}-no-awl-plugin.patch
+# Use Fedora's default soundfont instead of the removed one:
+Patch0:        %{name}-use-default-soundfont.patch
 # We don't build the common files (font files, wallpapers, demo song, instrument
 # list) into the binary executable to reduce its size. This is also useful to 
 # inform the users about the existence of different choices for common files.
 # The font files need to be separated due to the font packaging guidelines.
-Patch2:        %{name}-separate-commonfiles.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
-# Use Fedora's default soundfont instead of the removed one:
-Patch11:       %{name}-use-default-soundfont.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
+# http://musescore.org/en/node/5817
+Patch5:        %{name}-dso-linking.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -74,7 +71,19 @@ highlights:
     * Easy and fast note entry with mouse, keyboard or MIDI
     * Integrated sequencer and FluidSynth software synthesizer
     * Import and export of MusicXML and Standard MIDI Files (SMF)
-    * Available in 12 languages
+    * Translated in 26 languages
+
+%package doc
+Summary:       MuseScore documentation
+Group:         Documentation
+License:       CC-BY
+Requires:      %{name} = %{version}-%{release}
+BuildArch:     noarch
+
+%description doc
+MuseScore is a free cross platform WYSIWYG music notation program.
+
+This package contains the user manual of MuseScore in different languages.
 
 %package fonts
 Summary:       MuseScore fonts
@@ -99,19 +108,18 @@ This package contains the musical notati
 %prep
 %setup -q 
 
-%patch11 -p1 -b .default.soundfont
-%patch1 -p1 -b .noawlplugin
-%patch2 -p1 -b .separatecommon
+%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
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html
 
-
-
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags}|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -121,15 +129,9 @@ sed 's|\r||' %{name}/rtf2html/README > t
 touch -r %{name}/rtf2html/README tmpfile
 mv -f tmpfile %{name}/rtf2html/README
 
-# Fix for systems (usually 64bit ones) where size_t != unsigned int
-sed -i 's|relStaff %%d, %%d|relStaff %%d, %%zd|' %{name}/%{name}/importxml.cpp
-
 # 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
-
 # Disable rpath
 sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
 
@@ -138,7 +140,7 @@ sed -i '/rpath/d' %{name}/%{name}/CMakeL
 mkdir build
 pushd build
    export PATH=${PATH}:%{_libdir}/qt4/bin
-   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{buildflags}" ../mscore
+   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{optflags}" ../mscore
    make lupdate %{?_smp_flags}
    make lrelease %{?_smp_flags}
    make %{?_smp_flags} VERBOSE=1
@@ -187,7 +189,7 @@ mv %{buildroot}/%{_datadir}/pixmaps/%{na
 
 # Manpage
 mkdir -p %{buildroot}/%{_mandir}/man1
-install -pm 644 %{name}/packaging/%{name}.1 %{buildroot}/%{_mandir}/man1
+install -pm 644 %{name}/packaging/%{name}.1 %{buildroot}/%{_mandir}/man1/
 
 # Openoffice templates
 cp -a %{name}/utils/OOoMuseScore/ %{buildroot}/%{_datadir}/%{name}%{?majorver}
@@ -230,18 +232,30 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc mscore/{ChangeLog*,COPYING*,manual/manual-de.odt,NEWS,README*}
+%doc mscore/{ChangeLog*,COPYING*,NEWS,README*}
 %{_bindir}/%{name}
 %{_datadir}/%{name}%{?majorver}
+%exclude %{_datadir}/%{name}%{?majorver}/man/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/soundfonts/TimGM6mb.sf2
 %{_mandir}/man1/*
+%{_qt4_plugindir}/designer/libawlplugin.so
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/%{name}%{?majorver}/man/
 
 %_font_pkg %{fontfamilyname}*.ttf
 
 
 %changelog
+* Mon Jun 14 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.6-1
+- Update to 0.9.6
+- Split documentation into its own package
+- Move some gcc warning fixes into a patch
+
 * Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-3
 - Fix build flags on F-11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Aug 2009 01:27:15 -0000	1.3
+++ sources	15 Jun 2010 04:30:29 -0000	1.4
@@ -1 +1 @@
-389c64a782e41376eaa541d5cc47e400  mscore-0.9.5-free.tar.bz2
+298b7eaf46d092045600bebaa99bea0a  mscore-0.9.6-free.tar.bz2


--- mscore-no-awl-plugin.patch DELETED ---

More information about the scm-commits mailing list