[rosegarden4/f16] Update to 12.04

[Brendan Jones]

commit 6aad6195d76daf33e793026171d6931cb396421d
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Sun May 13 14:08:03 2012 +0200

    Update to 12.04

 .gitignore                        |    1 +
 rosegarden-11.11.42-gcc-4.7.patch |  313 -------------------------------------
 rosegarden-11.11.README           |   58 -------
 rosegarden-12.04.README           |   29 ++++
 rosegarden4.spec                  |   17 +--
 sources                           |    2 +-
 6 files changed, 36 insertions(+), 384 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 760a3e7..1401423 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ rosegarden-10.04.2.tar.bz2
 /rosegarden-11.02.tar.bz2
 /rosegarden-11.06.tar.bz2
 /rosegarden-11.11.42.tar.bz2
+/rosegarden-12.04.tar.bz2
diff --git a/rosegarden-12.04.README b/rosegarden-12.04.README
new file mode 100644
index 0000000..54d7755
--- /dev/null
+++ b/rosegarden-12.04.README
@@ -0,0 +1,29 @@
+====== ROSEGARDEN 12.04, codename "Freedom" RELEASED ======
+
+The Rosegarden team is proud to announce the release of version 12.04 of Rosegarden, an audio and MIDI sequencer and musical notation editor for Linux.
+
+http://www.rosegardenmusic.com/
+
+Ted Felix and Tom "Tehom" Breton did the biggest part of the work that went into this release.  Ted is a masochist who enjoys the challenge of cleaning up Rosegarden's enormous and complicated code in order to make it less buggy, and much more sensible.  Tehom is a visionary who comes up with crazy complicated ideas, and then actually goes off to get them to work.
+
+The most notable change for this release is a feature we hope you will find to be completely transparent.  Tom has labored for months to get through a gantlet of challenges and deliver automatic MIDI channel allocation.  Instead of having a permanent, fixed relationship between, for example, instrument #1 and channel 1, instruments float by default, and grab channels on an as-needed basis.  As control over a channel passes from one instrument to another, the controller state is preserved such that problems with sustain controllers, pitch bends and so on getting out of sync should be eliminated.  Segments may be moved about freely with no concern about the pitch bend in this one conflicting with the pitch bend in that one, even though they both reside on the same track.
+
+You may experience minor problems with existing compositions.  If so, these problems can usually be solved by setting certain instruments to fixed instead of auto.
+
+===== Major Changes =====
+  * Code cleanup, commenting, and simplification
+  * Extensive reworking of certain aspects of the track editor to enhance performance, improve reliability, and reduce bugs
+  * Fix for bug #3466912
+  * Fixed a crash when adding a track after going from record to stop
+  * Fixed a crash on add track, undo, redo, load RG sequence
+  * Fixed a track label clobbering bug
+  * Miscellaneous bug fixes.  (r12815, r12816, r12842)
+  * Fixed a bug where icons were not appearing on the instrument popup menu
+  * Fixed a bug where two tracks with the same instrument could be armed at the same time
+  * Added some missing GPL license text
+  * Fixed a static init order bug that would cause playback to not work for some users
+  * Handle tempo ramps during MIDI export
+  * Handle ornaments during MIDI export
+  * New logical instruments that allocate channels on the fly
+
+Michael did not do a good job of tracking changes for this release, and would like to apologize for any work he has omitted from this release note.
diff --git a/rosegarden4.spec b/rosegarden4.spec
index cb8a3c5..74d125a 100644
--- a/rosegarden4.spec
+++ b/rosegarden4.spec
@@ -1,5 +1,5 @@
-%global maj 11.11
-%global min .42
+%global maj 12.04
+%global min 
 
 Name:          rosegarden4
 Version:       %{maj}%{?min}
@@ -9,14 +9,12 @@ Group:         Applications/Multimedia
 License:       GPLv2+
 URL:           http://www.rosegardenmusic.com/
 Source0:       http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}/rosegarden-%{version}.tar.bz2
-# From         http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}/README
+# From         http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}-LINUX/README
 Source1:       rosegarden-%{maj}.README
 # Fedora doesn't want fonts built into the final binary
 Patch0:        rosegarden-separate-fonts.patch
 # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms 
 Patch1:        rosegarden-pluginpath.patch
-# fix redeclaration of iterator - from GCC 4.7 mas rebuild
-Patch2:        rosegarden-11.11.42-gcc-4.7.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
@@ -76,7 +74,6 @@ use of Rosegarden.
 %setup -q -n rosegarden-%{version}
 %patch0 -p1 -b .fonts
 %patch1 -p1 -b .pluginpath
-%patch2 -p1 -b .gcc4.7
 
 # Release notes
 cp -a %{SOURCE1} ./README.%{maj}
@@ -85,9 +82,6 @@ cp -a %{SOURCE1} ./README.%{maj}
 chmod 644 src/commands/segment/SegmentSplitTwiceCommand.*
 chmod 644 src/gui/widgets/BaseTextFloat.*
 
-# Add GenericName to the desktop file:
-echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop
-
 %build
 # The following is needed if kdelibs3 is installed
 unset QTDIR
@@ -148,9 +142,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc data/fonts/README COPYING
 
 %changelog
-* Tue Jan 17 2012 Brendan Jones <brendan.jones.it at gmail.com> - 11.11.42-1
-- Patch for GCC 4.7 FTB
-- New upstream 11.11.42
+* Thu May 10 2012 Brendan Jones <brendan.jones.it at gmail.com> - 12.04-1
+- New upstream 12.04, correct changelog
 
 * Sun Nov 27 2011 Brendan Jones <brendan.jones.it at gmail.com> - 11.11.11-1
 - Update to 11.11 and README
diff --git a/sources b/sources
index f4767b3..d6dae3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-552a1cad6dd60077573332bc6c650db0  rosegarden-11.11.42.tar.bz2
+b11f4fcad69df45365d2125181524559  rosegarden-12.04.tar.bz2