From 94b2934bb0d792127bf5319b40145e279faa8cbddebb865d040960639b34a13a Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sun, 17 Jan 2021 10:01:37 +0000 Subject: [PATCH] Accepting request 863765 from home:balping:branches:multimedia:apps - removed fonts/gootville/readme.txt executable bit fix, as it was fixed in upstream - install new fonts, most of them are otf - included additional third party licenses and readme files - added MUSESCORE_REVISION and MUSESCORE_BUILD_CONFIG flags, so that Musescore wouldn't think it's a dev build - tested on Tumbleweed with Qt 5.15.2. Couldn't reproduce issues with with palettes and migration window described here: https://github.com/musescore/MuseScore/pull/7119 OBS-URL: https://build.opensuse.org/request/show/863765 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=84 --- musescore.changes | 13 +++++++++++++ musescore.spec | 40 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/musescore.changes b/musescore.changes index 7048236..4358d27 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Jan 16 17:11:19 UTC 2021 - Balázs Dura-Kovács + +- removed fonts/gootville/readme.txt executable bit fix, as it was + fixed in upstream +- install new fonts, most of them are otf +- included additional third party licenses and readme files +- added MUSESCORE_REVISION and MUSESCORE_BUILD_CONFIG flags, + so that Musescore wouldn't think it's a dev build +- tested on Tumbleweed with Qt 5.15.2. Couldn't reproduce issues + with with palettes and migration window described here: + https://github.com/musescore/MuseScore/pull/7119 + ------------------------------------------------------------------- Fri Jan 15 12:11:09 UTC 2021 - Cor Blom diff --git a/musescore.spec b/musescore.spec index cc8c390..452635e 100644 --- a/musescore.spec +++ b/musescore.spec @@ -18,6 +18,7 @@ %define rname mscore %define version_lesser 3.6 +%define revision 1977cb3 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore @@ -115,15 +116,18 @@ sed 's/\r$//' thirdparty/rtf2html/README.ru > tmpfile touch -r thirdparty/rtf2html/README.ru tmpfile mv -f tmpfile thirdparty/rtf2html/README.ru -# remove executable bit -chmod -x fonts/gootville/readme.txt +sed 's/\r$//' thirdparty/portmidi/README.txt > tmpfile +touch -r thirdparty/portmidi/README.txt tmpfile +mv -f tmpfile thirdparty/portmidi/README.txt %build %define __builddir build.release %cmake \ -DCMAKE_BUILD_TYPE=RELEASE \ + -DMUSESCORE_BUILD_CONFIG=release \ -DUSE_SYSTEM_FREETYPE="ON" \ - -DBUILD_WEBENGINE="ON" + -DBUILD_WEBENGINE="ON" \ + -DMUSESCORE_REVISION=%{revision} %make_jobs lrelease all # Put the desktop file in place for the packaging @@ -136,6 +140,21 @@ strip-nondeterminism -t zip %{buildroot}%{_datadir}/%{rname}-%{version_lesser}/w # install fonts mkdir -p %{buildroot}%{fontdir} install -p -m 644 fonts/*.ttf %{buildroot}/%{fontdir} +install -p -m 644 fonts/*/*.ttf %{buildroot}/%{fontdir} +install -p -m 644 fonts/bravura/BravuraText.otf %{buildroot}/%{fontdir} +install -p -m 644 fonts/campania/Campania.otf %{buildroot}/%{fontdir} +install -p -m 644 fonts/edwin/*.otf %{buildroot}/%{fontdir} +install -p -m 644 fonts/gootville/GootvilleText.otf %{buildroot}/%{fontdir} +install -p -m 644 fonts/leland/LelandText.otf %{buildroot}/%{fontdir} +install -p -m 644 fonts/musejazz/MuseJazzText.otf %{buildroot}/%{fontdir} +install -p -m 644 fonts/petaluma/PetalumaText.otf %{buildroot}/%{fontdir} + +# unique names for font docs +mv fonts/edwin/README.md fonts/edwin/README.md.edwin +mv fonts/edwin/GPL_LICENSE.txt fonts/edwin/GPL_LICENSE.txt.edwin +mv fonts/edwin/LICENSE.md fonts/edwin/LICENSE.md.edwin +mv fonts/leland/README.md fonts/leland/README.md.leland +mv fonts/leland/LICENSE.txt fonts/leland/LICENSE.txt.leland # update desktop file %suse_update_desktop_file -n %{rname} AudioVideo AudioVideoEditing @@ -148,6 +167,8 @@ install -p -m 644 demos/*.mscz %{buildroot}%{_datadir}/%{rname}-%{version_lesser install -d -m 755 %{buildroot}%docdir install -p -m 644 thirdparty/beatroot/COPYING %{buildroot}%docdir/COPYING.beatroot install -p -m 644 thirdparty/beatroot/README.txt %{buildroot}%docdir/README.txt.beatroot +install -p -m 644 thirdparty/dtl/COPYING %{buildroot}%docdir/COPYING.BSD.dtl +install -p -m 644 thirdparty/freetype/README %{buildroot}%docdir/README.freetype install -p -m 644 thirdparty/intervaltree/README %{buildroot}%docdir/README.intervaltree install -p -m 644 thirdparty/ofqf/README.md %{buildroot}%docdir/README.md.ofqf install -p -m 644 thirdparty/rtf2html/ChangeLog %{buildroot}%docdir/ChangeLog.rtf2html @@ -155,6 +176,10 @@ install -p -m 644 thirdparty/rtf2html/COPYING.LESSER %{buildroot}%docdir/COPYIN install -p -m 644 thirdparty/rtf2html/README %{buildroot}%docdir/README.rtf2html install -p -m 644 thirdparty/rtf2html/README.mscore %{buildroot}%docdir/README.mscore.rtf2html install -p -m 644 thirdparty/rtf2html/README.ru %{buildroot}%docdir/README.ru.rtf2html +install -p -m 644 thirdparty/portmidi/README.txt %{buildroot}%docdir/README.txt.portmidi +install -p -m 644 thirdparty/portmidi/license.txt %{buildroot}%docdir/license.txt.portmidi +install -p -m 644 thirdparty/qt-google-analytics/README.md %{buildroot}%docdir/README.md.qt-google-analytics +install -p -m 644 thirdparty/qt-google-analytics/LICENSE.txt %{buildroot}%docdir/LICENSE.qt-google-analytics install -p -m 644 thirdparty/singleapp/LGPL_EXCEPTION.txt %{buildroot}%docdir/LGPL_EXCEPTION.txt.singleapp install -p -m 644 thirdparty/singleapp/LICENSE.GPL3 %{buildroot}%docdir/LICENSE.GPL3.singleapp install -p -m 644 thirdparty/singleapp/LICENSE.LGPL %{buildroot}%docdir/LICENSE.LGPL.singleapp @@ -211,10 +236,19 @@ install -p -m 644 share/wallpaper/COPYRIGHT %{buildroot}%docdir/COPYIN %files fonts %dir %{fontdir} %{fontdir}/*.ttf +%{fontdir}/*.otf %doc fonts/README.md %doc fonts/bravura/bravura-text.md %doc fonts/bravura/OFL-FAQ.txt %doc fonts/bravura/OFL.txt +%doc fonts/campania/LICENSE %doc fonts/gootville/readme.txt +# see section 'unique names for font docs' above +%doc fonts/edwin/README.md.edwin +%doc fonts/edwin/GPL_LICENSE.txt.edwin +%doc fonts/edwin/LICENSE.md.edwin +%doc fonts/leland/README.md.leland +%doc fonts/leland/LICENSE.txt.leland + %changelog