From 2b9a1aa221b186eb2cbbcb21830cf8244b4e67c2 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Jun 12 2009 00:36:52 +0000 Subject: - Font package cleanup for F-12 (RHBZ#493463) - One specfile for all releases --- diff --git a/mscore-use-pclite-soundfont.patch b/mscore-use-pclite-soundfont.patch new file mode 100644 index 0000000..7defea4 --- /dev/null +++ b/mscore-use-pclite-soundfont.patch @@ -0,0 +1,57 @@ +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 @@ + ../share/templates/instruments.xml + data/splash.jpg + ../demos/promenade.msc +- 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() + 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() + 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 --git a/mscore.spec b/mscore.spec index af9d699..198f6e3 100644 --- a/mscore.spec +++ b/mscore.spec @@ -1,10 +1,15 @@ -%define fontfamilyname %{name} -%define minorver -0.9 +%global fontfamilyname %{name} +%global majorver -0.9 +%if 0%{?fedora} >= 12 +%global fontpackagename fonts +%else +%global fontpackagename %{fontfamilyname}-fonts +%endif Name: mscore Summary: Music Composition & Notation Software Version: 0.9.4 -Release: 3%{?dist} +Release: 4%{?dist} # rtf2html is LGPLv2+ # paper4.png paper5.png are LGPLv3 # the rest is GPLv2 @@ -18,8 +23,6 @@ URL: http://musescore.org/en # rm -f mscore-*/mscore/mscore/data/piano1.sf2 # tar jcf mscore-0.9.4-free.tar.bz2 mscore-0.9.4/ Source0: %{name}-%{version}-free.tar.bz2 -# Use Fedora's default soundfont instead of the removed one: -Patch0: %{name}-use-default-soundfont.patch # 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. @@ -29,25 +32,49 @@ Patch1: %{name}-no-awl-plugin.patch # 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 +# On Fedora < 11 there is no default soundfont +Patch10: %{name}-use-pclite-soundfont.patch +# Use Fedora's default soundfont instead of the removed one: +Patch11: %{name}-use-default-soundfont.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake jack-audio-connection-kit-devel qt4-devel -BuildRequires: alsa-lib-devel portaudio-devel fluidsynth-devel +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 # Fonts related: -BuildRequires: t1utils fontforge texlive fontpackages-devel -%if "%{fedora}" >= "11" +BuildRequires: fontforge +BuildRequires: fontpackages-devel +BuildRequires: t1utils +BuildRequires: texlive +%if 0%{?fedora} >= 11 BuildRequires: tex-cm-lgc +%else +BuildRequires: tetex-font-cm-lgc %endif +# fontpackages-1.21 has different behavior +%if 0%{?fedora} >= 12 +Requires: %{name}-fonts = %{version}-%{release} +%else Requires: %{name}-%{fontfamilyname}-fonts = %{version}-%{release} +%endif # Doxygen documentation is useless. 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 +%if 0%{?fedora} >= 11 Requires: soundfont2-default +%else +Requires: PersonalCopy-Lite-soundfont +%endif Provides: musescore = %{name}-%{version} @@ -63,13 +90,18 @@ highlights: * Import and export of MusicXML and Standard MIDI Files (SMF) * Available in 12 languages -%package %{fontfamilyname}-fonts +# fontpackages-1.21 has different behavior +%package %{fontpackagename} Summary: MuseScore fonts Group: User Interface/X License: GPL+ with exceptions Requires: fontpackages-filesystem +%if "%{fontpackagename}" == "fonts" +Obsoletes: mscore-mscore-fonts < 0.9.4-4 +Provides: mscore-mscore-fonts = %{version}-%{release} +%endif -%description %{fontfamilyname}-fonts +%description %{fontpackagename} MuseScore is a free cross platform WYSIWYG music notation program. This package contains the musical notation fonts for use of MuseScore. @@ -77,7 +109,11 @@ This package contains the musical notation fonts for use of MuseScore. %prep %setup -q -%patch0 -p1 -b .fluid +%if 0%{?fedora} < 11 +%patch10 -p1 -b .pclite.soundfont +%else +%patch11 -p1 -b .default.soundfont +%endif %patch1 -p1 -b .noawlplugin %patch2 -p1 -b .separatecommon @@ -145,7 +181,7 @@ mkdir -p %{buildroot}/%{_mandir}/man1 install -pm 644 %{name}/packaging/%{name}.1 %{buildroot}/%{_mandir}/man1 # Openoffice templates -cp -a %{name}/utils/OOoMuseScore/ %{buildroot}/%{_datadir}/%{name}%{?minorver} +cp -a %{name}/utils/OOoMuseScore/ %{buildroot}/%{_datadir}/%{name}%{?majorver} # There are many doc files spread around the tarball. Let's collect them pushd %{name} @@ -182,14 +218,26 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %doc mscore/{ChangeLog*,COPYING*,manual/manual-de.odt,NEWS,README*} %{_bindir}/%{name} -%{_datadir}/%{name}%{?minorver} +%{_datadir}/%{name}%{?majorver} %{_datadir}/icons/hicolor/*/*/* %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/* +# fontpackages-1.21 has different behavior +%if "%{fontpackagename}" == "fonts" +%_font_pkg %{fontfamilyname}*.ttf +%else %_font_pkg -n %{fontfamilyname} %{fontfamilyname}*.ttf +%endif + +%changelog +* Thu Jun 11 2009 Orcan Ogetbil 0.9.4-4 +- Font package cleanup for F-12 (RHBZ#493463) +- One specfile for all releases + +* Mon Mar 23 2009 Orcan Ogetbil 0.9.4-3.fc10.1 +- Add BR: tetex-font-cm-lgc for Fedora < 11 -%changelog * Mon Mar 23 2009 Orcan Ogetbil 0.9.4-3 - Add Provides: musescore = %%{name}-%%{version} - Replace "fluid-soundfont" requirement with "soundfont2-default"