SHA256
1
0
forked from pool/musescore

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
This commit is contained in:
Cor Blom 2021-01-17 10:01:37 +00:00 committed by Git OBS Bridge
parent 0f89493c59
commit 94b2934bb0
2 changed files with 50 additions and 3 deletions

View File

@ -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 <cornelis@solcon.nl> Fri Jan 15 12:11:09 UTC 2021 - Cor Blom <cornelis@solcon.nl>

View File

@ -18,6 +18,7 @@
%define rname mscore %define rname mscore
%define version_lesser 3.6 %define version_lesser 3.6
%define revision 1977cb3
%define fontdir %{_datadir}/fonts/%{name} %define fontdir %{_datadir}/fonts/%{name}
%define docdir %{_docdir}/%{name} %define docdir %{_docdir}/%{name}
Name: musescore Name: musescore
@ -115,15 +116,18 @@ sed 's/\r$//' thirdparty/rtf2html/README.ru > tmpfile
touch -r thirdparty/rtf2html/README.ru tmpfile touch -r thirdparty/rtf2html/README.ru tmpfile
mv -f tmpfile thirdparty/rtf2html/README.ru mv -f tmpfile thirdparty/rtf2html/README.ru
# remove executable bit sed 's/\r$//' thirdparty/portmidi/README.txt > tmpfile
chmod -x fonts/gootville/readme.txt touch -r thirdparty/portmidi/README.txt tmpfile
mv -f tmpfile thirdparty/portmidi/README.txt
%build %build
%define __builddir build.release %define __builddir build.release
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_BUILD_TYPE=RELEASE \
-DMUSESCORE_BUILD_CONFIG=release \
-DUSE_SYSTEM_FREETYPE="ON" \ -DUSE_SYSTEM_FREETYPE="ON" \
-DBUILD_WEBENGINE="ON" -DBUILD_WEBENGINE="ON" \
-DMUSESCORE_REVISION=%{revision}
%make_jobs lrelease all %make_jobs lrelease all
# Put the desktop file in place for the packaging # 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 # install fonts
mkdir -p %{buildroot}%{fontdir} 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/*/*.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 # update desktop file
%suse_update_desktop_file -n %{rname} AudioVideo AudioVideoEditing %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 -d -m 755 %{buildroot}%docdir
install -p -m 644 thirdparty/beatroot/COPYING %{buildroot}%docdir/COPYING.beatroot 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/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/intervaltree/README %{buildroot}%docdir/README.intervaltree
install -p -m 644 thirdparty/ofqf/README.md %{buildroot}%docdir/README.md.ofqf install -p -m 644 thirdparty/ofqf/README.md %{buildroot}%docdir/README.md.ofqf
install -p -m 644 thirdparty/rtf2html/ChangeLog %{buildroot}%docdir/ChangeLog.rtf2html 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 %{buildroot}%docdir/README.rtf2html
install -p -m 644 thirdparty/rtf2html/README.mscore %{buildroot}%docdir/README.mscore.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/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/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.GPL3 %{buildroot}%docdir/LICENSE.GPL3.singleapp
install -p -m 644 thirdparty/singleapp/LICENSE.LGPL %{buildroot}%docdir/LICENSE.LGPL.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 %files fonts
%dir %{fontdir} %dir %{fontdir}
%{fontdir}/*.ttf %{fontdir}/*.ttf
%{fontdir}/*.otf
%doc fonts/README.md %doc fonts/README.md
%doc fonts/bravura/bravura-text.md %doc fonts/bravura/bravura-text.md
%doc fonts/bravura/OFL-FAQ.txt %doc fonts/bravura/OFL-FAQ.txt
%doc fonts/bravura/OFL.txt %doc fonts/bravura/OFL.txt
%doc fonts/campania/LICENSE
%doc fonts/gootville/readme.txt %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 %changelog