From f3ab15769d2975c2448b957741c0db5ee327c3aeae1f678933abbd822ff784e0 Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Wed, 13 Nov 2019 14:18:11 +0000
Subject: [PATCH 1/2] test update to 3.3.1

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=56
---
 MuseScore-3.3.1.tar.gz | 3 +++
 MuseScore-3.3.tar.gz   | 3 ---
 correct-revision.patch | 2 +-
 musescore.spec         | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 MuseScore-3.3.1.tar.gz
 delete mode 100644 MuseScore-3.3.tar.gz

diff --git a/MuseScore-3.3.1.tar.gz b/MuseScore-3.3.1.tar.gz
new file mode 100644
index 0000000..b065f55
--- /dev/null
+++ b/MuseScore-3.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb010f4e0657a1bc647587007dafe2d372ae0da1119f7208bf47b3b6f6d498e4
+size 62806745
diff --git a/MuseScore-3.3.tar.gz b/MuseScore-3.3.tar.gz
deleted file mode 100644
index 0a7c1db..0000000
--- a/MuseScore-3.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8da08e31e7e6ab438a2a48f2525d967d544cb2540b6ecff56fcc65d00754e281
-size 64453809
diff --git a/correct-revision.patch b/correct-revision.patch
index f58976e..b58f099 100644
--- a/correct-revision.patch
+++ b/correct-revision.patch
@@ -2,4 +2,4 @@
 +++ b/mscore/revision.h
 @@ -1 +1 @@
 -3543170
-+4761df6
++824af4c
diff --git a/musescore.spec b/musescore.spec
index 732c0a8..8aa2845 100644
--- a/musescore.spec
+++ b/musescore.spec
@@ -21,7 +21,7 @@
 %define fontdir %{_datadir}/fonts/%{name}
 %define docdir  %{_docdir}/%{name}
 Name:           musescore
-Version:        3.3.0
+Version:        3.3.1
 Release:        0
 Summary:        A WYSIWYG music score typesetter
 # Musescore code license is GPL-2.0
@@ -30,7 +30,7 @@ Summary:        A WYSIWYG music score typesetter
 License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND MIT
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 URL:            https://musescore.org
-Source0:        https://github.com/musescore/MuseScore/archive/v%{version_lesser}/MuseScore-%{version_lesser}.tar.gz
+Source0:        https://github.com/musescore/MuseScore/archive/v%{version}/MuseScore-%{version}.tar.gz
 Source1:        %{rname}.desktop
 # PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases
 Patch0:         correct-revision.patch
@@ -95,7 +95,7 @@ BuildArch:      noarch
 Additional fonts for use by the MuseScore music notation program.
 
 %prep
-%setup -q -n MuseScore-%{version_lesser}
+%setup -q -n MuseScore-%{version}
 %patch0 -p1
 
 # remove precompiled binary

From e688a126d606c610dc49282028edf061c03680881fcbf07f9ea61fcd4cf10010 Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Wed, 13 Nov 2019 14:29:13 +0000
Subject: [PATCH 2/2] - Update to 3.3.1:   * MuseScore crashed on startup in
 some cases on Windows 7   * Palettes were incorrectly placed when using
 multiple HighDPI     monitors and scaling   * Palettes disappeared on Ubuntu
 18.04 in some cases - Update correct-revision.patch - Remove line from spec
 to remove rtf2html binary: it is no longer   part of the source tarball

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=57
---
 musescore.changes | 12 ++++++++++++
 musescore.spec    |  3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/musescore.changes b/musescore.changes
index f7232dd..8d0a0ba 100644
--- a/musescore.changes
+++ b/musescore.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Nov 13 14:26:14 UTC 2019 - Cor Blom <cornelis@solcon.nl>
+
+- Update to 3.3.1:
+  * MuseScore crashed on startup in some cases on Windows 7
+  * Palettes were incorrectly placed when using multiple HighDPI
+    monitors and scaling
+  * Palettes disappeared on Ubuntu 18.04 in some cases
+- Update correct-revision.patch
+- Remove line from spec to remove rtf2html binary: it is no longer
+  part of the source tarball
+
 -------------------------------------------------------------------
 Tue Nov  5 08:44:37 UTC 2019 - Cor Blom <cornelis@solcon.nl>
 
diff --git a/musescore.spec b/musescore.spec
index 8aa2845..e5eed5e 100644
--- a/musescore.spec
+++ b/musescore.spec
@@ -98,9 +98,6 @@ Additional fonts for use by the MuseScore music notation program.
 %setup -q -n MuseScore-%{version}
 %patch0 -p1
 
-# remove precompiled binary
-rm thirdparty/rtf2html/rtf2html
-
 # fix EOL encoding
 sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile
 touch -r fonts/bravura/OFL-FAQ.txt tmpfile