diff --git a/.cvsignore b/.cvsignore index 5634d31..207886e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mscore-0.9.4-free.tar.bz2 +mscore-0.9.5-free.tar.bz2 diff --git a/mscore-ConvertFont.ff b/mscore-ConvertFont.ff new file mode 100644 index 0000000..9060dec --- /dev/null +++ b/mscore-ConvertFont.ff @@ -0,0 +1,14 @@ +#!/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 diff --git a/mscore-separate-commonfiles.patch b/mscore-separate-commonfiles.patch index 185879c..9db7967 100644 --- a/mscore-separate-commonfiles.patch +++ b/mscore-separate-commonfiles.patch @@ -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/mscore/mscore.cpp mscore-0.9.4/mscore/mscore/ 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 @@ @@ -32,26 +38,28 @@ diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/ data/text_bold.svg data/text_italic.svg data/text_left.svg -@@ -29,11 +29,11 @@ +@@ -29,12 +29,12 @@ data/viewmag.xpm data/subscript.svg data/superscript.svg - fonts/mscore-20.ttf - fonts/mscore1-20.ttf +- fonts/MuseJazz.ttf - ../share/templates/instruments.xml + + + ++ data/splash.jpg -- ../demos/promenade.msc +- ../demos/promenade.mscx + data/speaker.svg data/midiin.svg -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/mscore/preferences.cpp mscore-0.9.4/mscore/ms 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/mscore/preferences.cpp mscore-0.9.4/mscore/ms 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(); + bgColor = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value(); + +@@ -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"); diff --git a/mscore-use-default-soundfont.patch b/mscore-use-default-soundfont.patch index b71604b..3b03479 100644 --- a/mscore-use-default-soundfont.patch +++ b/mscore-use-default-soundfont.patch @@ -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 @@ ../share/templates/instruments.xml data/splash.jpg - ../demos/promenade.msc + ../demos/promenade.mscx - data/piano1.sf2 + data/speaker.svg data/midiin.svg data/undo.svg -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)); diff --git a/mscore-use-pclite-soundfont.patch b/mscore-use-pclite-soundfont.patch index 7defea4..9c17e9c 100644 --- a/mscore-use-pclite-soundfont.patch +++ b/mscore-use-pclite-soundfont.patch @@ -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 @@ ../share/templates/instruments.xml data/splash.jpg - ../demos/promenade.msc + ../demos/promenade.mscx - data/piano1.sf2 + data/speaker.svg data/midiin.svg data/undo.svg -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)); diff --git a/mscore.spec b/mscore.spec index 198f6e3..fefe6a1 100644 --- a/mscore.spec +++ b/mscore.spec @@ -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}-%{version}-%{release}-root-%(%{__id_u} -n) 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}-%{release} 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, %%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 + +# 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/hicolor &>/dev/null || : %{_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/hicolor &>/dev/null || : %endif %changelog +* Fri Aug 21 2009 Orcan Ogetbil 0.9.5-1 +- Update to 0.9.5 + +* Wed Aug 05 2009 Orcan Ogetbil 0.9.4-6 +- Update the .desktop file + +* Sat Jul 25 2009 Fedora Release Engineering - 0.9.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jun 11 2009 Orcan Ogetbil 0.9.4-4 - Font package cleanup for F-12 (RHBZ#493463) - One specfile for all releases diff --git a/mscore.xml b/mscore.xml new file mode 100644 index 0000000..c854d7c --- /dev/null +++ b/mscore.xml @@ -0,0 +1,9 @@ + + + + MuseScore file + + + + + diff --git a/sources b/sources index 7a81126..9289aee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69dd95b38a848b4f4ce4a4c47a7030ea mscore-0.9.4-free.tar.bz2 +389c64a782e41376eaa541d5cc47e400 mscore-0.9.5-free.tar.bz2