[muse] Update to MusE-2.0-rc2

[Orcan Ogetbil]

commit c55a18908f4e3bba88f28cfe0d7a80cae79a5dcd
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Jan 14 17:49:03 2012 -0500

    Update to MusE-2.0-rc2

 .gitignore       |    1 +
 muse-gcc47.patch |   14 ++++++++++++++
 muse.spec        |   12 ++++++++----
 sources          |    2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ac68b9..9f81f1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /muse-2.0alpha.tar.gz
 /muse-2.0beta2.tar.gz
 /muse-2.0rc1.tar.gz
+/muse-2.0rc2.tar.gz
diff --git a/muse-gcc47.patch b/muse-gcc47.patch
new file mode 100644
index 0000000..0d77685
--- /dev/null
+++ b/muse-gcc47.patch
@@ -0,0 +1,14 @@
+diff -rupN muse-2.0.old/muse/liste/editevent.cpp muse-2.0/muse/liste/editevent.cpp
+--- muse-2.0.old/muse/liste/editevent.cpp	2012-01-06 00:35:34.785111841 -0500
++++ muse-2.0/muse/liste/editevent.cpp	2012-01-06 08:32:49.151509107 -0500
+@@ -632,8 +632,8 @@ EditCtrlDialog::EditCtrlDialog(int tick,
+       std::list<QString> sList;
+       typedef std::list<QString>::iterator isList;
+ 
+-      for (MusECore::iMidiCtrlValList i = cll->begin(); i != cll->end(); ++i) {
+-            MusECore::MidiCtrlValList* cl = i->second;
++      for (MusECore::iMidiCtrlValList it = cll->begin(); it != cll->end(); ++it) {
++            MusECore::MidiCtrlValList* cl = it->second;
+             int num             = cl->num();
+ 
+             // dont show drum specific controller if not a drum track
diff --git a/muse.spec b/muse.spec
index 2e5ad61..b86deee 100644
--- a/muse.spec
+++ b/muse.spec
@@ -1,4 +1,4 @@
-%global prerelease rc1
+%global prerelease rc2
 
 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.6.%{prerelease}%{?dist}
+Release:       0.7.%{prerelease}%{?dist}
 # original freeverb plugin was public domain
 # ladspa.h is LGPLv2+
 # givertcap (not built) is GPLv2
@@ -15,7 +15,8 @@ License:       Public Domain 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
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Gcc-4.7 compile fix. From upstream trunk r1377
+Patch0:        muse-gcc47.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
@@ -42,7 +43,7 @@ for Linux.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
-
+%patch0 -p1 -b .gcc47
 
 %build
 mkdir -p %{_target_platform}
@@ -87,6 +88,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/mime/packages/muse.xml
 
 %changelog
+* Sat Jan 14 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:2.0-0.7.rc2
+- Update to MusE-2.0-rc2
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.0-0.6.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index ad36b2b..f82b203 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43948df553bc35748cb87f75576ecceb  muse-2.0rc1.tar.gz
+6ddcac479696db8cc4d291e2a6881f92  muse-2.0rc2.tar.gz