[muse] Update to MusE-2.0-beta2

[Orcan Ogetbil]

commit 055b9341d955ef3a1eef633a05dad03f2ecbb5d5
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Jun 19 18:27:13 2011 -0400

    Update to MusE-2.0-beta2

 .gitignore               |    1 +
 muse-gcc46.patch         |   11 ----
 muse-noglyphsource.patch |   13 ++++
 muse-svn680to681.patch   |  144 ----------------------------------------------
 muse.spec                |   30 ++++------
 sources                  |    2 +-
 6 files changed, 28 insertions(+), 173 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b1fa8b..36f2dae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /muse-1.1.tar.gz
 /muse-2.0alpha.tar.gz
+/muse-2.0beta2.tar.gz
diff --git a/muse-noglyphsource.patch b/muse-noglyphsource.patch
new file mode 100644
index 0000000..87adf3d
--- /dev/null
+++ b/muse-noglyphsource.patch
@@ -0,0 +1,13 @@
+diff -rupN muse-2.0beta2.old/share/scoreglyphs/CMakeLists.txt muse-2.0beta2/share/scoreglyphs/CMakeLists.txt
+--- muse-2.0beta2.old/share/scoreglyphs/CMakeLists.txt	2011-05-06 11:28:39.000000000 -0400
++++ muse-2.0beta2/share/scoreglyphs/CMakeLists.txt	2011-06-18 23:25:23.000000000 -0400
+@@ -20,9 +20,6 @@
+ 
+ file (GLOB scoreglyph_files *.png LICENSE)
+ 
+-subdirs( feta-original
+-       )
+-
+ install( FILES ${scoreglyph_files}
+       DESTINATION ${MusE_SHARE_DIR}/scoreglyphs
+       )
diff --git a/muse.spec b/muse.spec
index f97ed74..15b46a5 100644
--- a/muse.spec
+++ b/muse.spec
@@ -1,4 +1,4 @@
-%global prerelease alpha
+%global prerelease beta2
 
 Name:          muse
 Summary:       Midi/Audio Music Sequencer
@@ -6,7 +6,7 @@ Summary:       Midi/Audio Music Sequencer
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
 Version:       2.0
-Release:       0.3.alpha%{?dist}
+Release:       0.4.%{prerelease}%{?dist}
 # synti/vam is GPLv2+
 # original freeverb plugin was public domain
 # some of the widgets are GPLv2
@@ -18,18 +18,8 @@ License:       GPL+ and GPLv2 and GPLv2+ and LGPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.muse-sequencer.org/
 Source0:       https://downloads.sourceforge.net/project/lmuse/%{name}-%{version}/%{name}-%{version}%{?prerelease}.tar.gz
-# Bunch of packaging related fixes. From upstream trunk:
-#     o Added missing AudioVideo category to the .desktop file.
-#     o Fixed the executable name in the .desktop file.
-#     o Converted README.softsynth, synti/vam/README, README.de, SECURITY to UTF8.
-#     o Made the default MusE_DOC_DIR consistent with other default definitions.
-#     o Removed explicit rpath to ${QT_LIBRARY_DIR}. cmake should add it automatically
-#       if there's need.
-#     o Removed unnecessary linkage to libQtSvg.
-#     o utils are installed with executable permissons.
-Patch0:        muse-svn680to681.patch
-# Fix build failure against gcc-4.6. Upstreamed:
-Patch1:        muse-gcc46.patch
+# Don't install score fonts. From trunk:
+Patch0:        muse-noglyphsource.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -57,9 +47,7 @@ for Linux.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
-%patch0 -p0
-%patch1 -p1
-
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -73,6 +61,8 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# install release notes
+cp -a readme_muse*.txt %{buildroot}/%{_docdir}/%{name}-%{version}/
 
 %check
 desktop-file-validate \
@@ -104,8 +94,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}-%{version}*/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}_icon.png
+%{_mandir}/man1/grepmidi*
+%{_mandir}/man1/%{name}*
+%{_datadir}/mime/packages/muse.xml
 
 %changelog
+* Sat Jun 18 2011 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:2.0-0.4.beta2
+- Update to MusE-2.0-beta2
+
 * Tue Feb 08 2011 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:2.0-0.3.alpha
 - Fix build failure against gcc-4.6
 
diff --git a/sources b/sources
index 79bdcd0..a2af19b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9622b5bbba33add3f0e49a719e924879  muse-2.0alpha.tar.gz
+1da3b10bcde157b1fee5921267ada8ac  muse-2.0beta2.tar.gz