[mscore] 1.3, resolve legal issue

[Tom Callaway]

commit 7e44fd357d79b52984d4c26dbc920cfbcdb97989
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Apr 12 13:26:57 2013 -0400

    1.3, resolve legal issue

 .gitignore                  |    1 +
 mscore-1.3-no-prelude.patch |   11 +++++++++++
 mscore.spec                 |   25 ++++++++++++++++++-------
 sources                     |    2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f31eaf8..a8652bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ mscore-0.9.6.2-free.tar.bz2
 /mscore-1.0-free.tar.bz2
 /mscore-1.1-free.tar.bz2
 /mscore-1.2-free.tar.bz2
+/mscore-1.3-free.tar.bz2
diff --git a/mscore-1.3-no-prelude.patch b/mscore-1.3-no-prelude.patch
new file mode 100644
index 0000000..4a6ee3a
--- /dev/null
+++ b/mscore-1.3-no-prelude.patch
@@ -0,0 +1,11 @@
+diff -up mscore-1.3/mscore/demos/CMakeLists.txt.noprelude mscore-1.3/mscore/demos/CMakeLists.txt
+--- mscore-1.3/mscore/demos/CMakeLists.txt.noprelude	2013-04-12 13:14:40.578638487 -0400
++++ mscore-1.3/mscore/demos/CMakeLists.txt	2013-04-12 13:14:46.185638856 -0400
+@@ -28,7 +28,6 @@ install(FILES
+       inv10.mscx
+       inv13.mscx
+       praeludium1.mscx
+-      prelude.mscx
+       promenade.mscx
+       scales.mscx
+       sonata16.mscx
diff --git a/mscore.spec b/mscore.spec
index 9a22094..4503a0a 100644
--- a/mscore.spec
+++ b/mscore.spec
@@ -2,20 +2,22 @@
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
-Version:       1.2
-Release:       3%{?dist}
+Version:       1.3
+Release:       1%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
-License:       GPLv2 and LGPLv2+ and LGPLv3
+License:       GPLv2 and LGPLv2+ and LGPLv3 and CC-BY
 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://download.sourceforge.net/mscore/mscore-1.2.tar.bz2
-#    tar jxf mscore-1.2.tar.bz2
+# And one demo file which is CC-BY-NC-SA (non-free)
+# We generate our own tarball by removing these files via:
+#    wget http://download.sourceforge.net/mscore/mscore-1.3.tar.bz2
+#    tar jxf mscore-1.3.tar.bz2
 #    rm -f mscore-*/mscore/mscore/data/piano1.sf2
-#    tar jcf mscore-1.2-free.tar.bz2 mscore-1.2/
+#    rm -f mscore-*/mscore/demos/prelude.mscx
+#    tar jcf mscore-1.3-free.tar.bz2 mscore-1.3/
 Source0:       %{name}-%{version}-free.tar.bz2
 # For mime types
 Source2:       %{name}.xml
@@ -37,6 +39,8 @@ Patch5:        %{name}-dso-linking.patch
 Patch6:        %{name}-system-qtsingleapplication.patch
 # Fix crash on Accidentals click RHBZ#738044 From upstream trunk rev 3193
 Patch8:        %{name}-fix-accidentals-crash.patch
+# Remove prelude from cmake files
+Patch9:        mscore-1.3-no-prelude.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
@@ -95,6 +99,8 @@ BuildRequires: fontpackages-devel
 BuildRequires: t1utils
 BuildRequires: texlive
 BuildRequires: tex-cm-lgc
+BuildRequires: texlive-metapost-bin
+BuildRequires: texlive-mf2pt1-bin
 
 %description fonts
 MuseScore is a free cross platform WYSIWYG music notation program.
@@ -111,6 +117,7 @@ This package contains the musical notation fonts for use of MuseScore.
 %patch5 -p1 -b .dso
 %patch6 -p1 -b .qtsingleapp
 %patch8 -p1 -b .accidentals
+%patch9 -p1 -b .noprelude
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html
@@ -251,6 +258,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Apr 12 2013 Tom Callaway <spot at fedoraproject.org> - 1.3-1
+- update to 1.3
+- remove mscore/demos/prelude.mscx from source tarball (it is non-free, see bz951379)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 485e7fd..bafcc17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee90df0d3123ff59479c2df249027a78  mscore-1.2-free.tar.bz2
+10b5aba66025dcf8b2dd887fc03abfb4  mscore-1.3-free.tar.bz2