diff --git a/rosegarden-10.02-plugin-lib64path.patch b/rosegarden-10.02-plugin-lib64path.patch deleted file mode 100644 index 60e554d..0000000 --- a/rosegarden-10.02-plugin-lib64path.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: src/sound/LADSPAPluginFactory.cpp -=================================================================== ---- src/sound/LADSPAPluginFactory.cpp.orig 2011-12-11 22:09:29.000000000 +0200 -+++ src/sound/LADSPAPluginFactory.cpp 2012-03-08 10:16:04.934978704 +0200 -@@ -565,7 +565,7 @@ LADSPAPluginFactory::getPluginPath() - path = cpath; - - if (path == "") { -- path = "/usr/local/lib/ladspa:/usr/lib/ladspa"; -+ path = "/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa"; - char *home = getenv("HOME"); - if (home) - path = std::string(home) + "/.ladspa:" + path; -Index: src/sound/DSSIPluginFactory.cpp -=================================================================== ---- src/sound/DSSIPluginFactory.cpp.orig 2011-12-11 22:09:29.000000000 +0200 -+++ src/sound/DSSIPluginFactory.cpp 2012-03-08 10:16:04.935978674 +0200 -@@ -234,7 +234,7 @@ DSSIPluginFactory::getPluginPath() - path = cpath; - - if (path == "") { -- path = "/usr/local/lib/dssi:/usr/lib/dssi"; -+ path = "/usr/local/lib/dssi:/usr/lib/dssi:/usr/local/lib64/dssi:/usr/lib64/dssi"; - char *home = getenv("HOME"); - if (home) - path = std::string(home) + "/.dssi:" + path; diff --git a/rosegarden-11.11-gplv2+.patch b/rosegarden-11.11-gplv2+.patch deleted file mode 100644 index 1c47fc5..0000000 --- a/rosegarden-11.11-gplv2+.patch +++ /dev/null @@ -1,118 +0,0 @@ -Index: src/gui/dialogs/AboutDialog.cpp -=================================================================== ---- src/gui/dialogs/AboutDialog.cpp.orig 2011-12-11 22:09:15.000000000 +0200 -+++ src/gui/dialogs/AboutDialog.cpp 2012-03-08 10:16:23.262430415 +0200 -@@ -51,7 +51,7 @@ AboutDialog::AboutDialog(QWidget *parent - mainLayout->addLayout(headerLayout); - - QLabel *label2 = new QLabel; -- label2->setText(tr("

Copyright 2000-2011 the Rosegarden development team

Version: %1   Qt version: %2
Build key: %3

Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit http://www.rosegardenmusic.com/resources/authors.
For more information about Rosegarden, visit http://www.rosegardenmusic.com.

License: GNU General Public License Version 2

").arg(VERSION).arg(QT_VERSION_STR).arg(BUILDKEY)); -+ label2->setText(tr("

Copyright 2000-2011 the Rosegarden development team

Version: %1   Qt version: %2
Build key: %3

Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit http://www.rosegardenmusic.com/resources/authors.
For more information about Rosegarden, visit http://www.rosegardenmusic.com.

License: GNU General Public License Version 2 or later

").arg(VERSION).arg(QT_VERSION_STR).arg(BUILDKEY)); - label2->setWordWrap(true); - label2->setAlignment(Qt::AlignHCenter); - label2->setOpenExternalLinks(true); -Index: COPYING -=================================================================== ---- COPYING.orig 2011-12-11 22:09:53.000000000 +0200 -+++ COPYING 2012-03-08 10:16:23.263430385 +0200 -@@ -1,12 +1,12 @@ -- GNU GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - -- Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 675 Mass Ave, Cambridge, MA 02139, USA -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ software--to make sure the software is f - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by --the GNU Library General Public License instead.) You can apply it to -+the GNU Lesser General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not -@@ -255,7 +255,7 @@ make exceptions for this. Our decision - of preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,4 +277,63 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -- END OF TERMS AND CONDITIONS -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+convey the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ -+ Copyright (C) -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+If the program is interactive, make it output a short notice like this -+when it starts in an interactive mode: -+ -+ Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, the commands you use may -+be called something other than `show w' and `show c'; they could even be -+mouse-clicks or menu items--whatever suits your program. -+ -+You should also get your employer (if you work as a programmer) or your -+school, if any, to sign a "copyright disclaimer" for the program, if -+necessary. Here is a sample; alter the names: -+ -+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program -+ `Gnomovision' (which makes passes at compilers) written by James Hacker. -+ -+ , 1 April 1989 -+ Ty Coon, President of Vice -+ -+This General Public License does not permit incorporating your program into -+proprietary programs. If your program is a subroutine library, you may -+consider it more useful to permit linking proprietary applications with the -+library. If this is what you want to do, use the GNU Lesser General -+Public License instead of this License. diff --git a/rosegarden-11.11.42.tar.bz2 b/rosegarden-11.11.42.tar.bz2 deleted file mode 100644 index 8167322..0000000 --- a/rosegarden-11.11.42.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b03f074041a0a9240399751564fb21300cc491be87319354d552d674ceda546 -size 5830779 diff --git a/rosegarden-12.12.25.tar.bz2 b/rosegarden-12.12.25.tar.bz2 new file mode 100644 index 0000000..f229638 --- /dev/null +++ b/rosegarden-12.12.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4efc73428ceae484c3833ea0d9666338870410afade311a0b6d06a8481b87ee +size 6049336 diff --git a/rosegarden-gcc47.patch b/rosegarden-gcc47.patch deleted file mode 100644 index 279e638..0000000 --- a/rosegarden-gcc47.patch +++ /dev/null @@ -1,313 +0,0 @@ -diff -Nur rosegarden-11.11.42.orig/src/base/Overlaps.h rosegarden-11.11.42/src/base/Overlaps.h ---- rosegarden-11.11.42.orig/src/base/Overlaps.h 2011-12-11 21:09:32.000000000 +0100 -+++ rosegarden-11.11.42/src/base/Overlaps.h 2012-01-17 19:59:41.338313832 +0100 -@@ -65,15 +65,15 @@ - timeT segEnd = (*i)->getEndMarkerTime(); - - // Start and ends of segments always are range limits -- insert(std::pair >(segStart, range)); -- insert(std::pair >(segEnd, range)); -+ this->insert(std::pair >(segStart, range)); -+ this->insert(std::pair >(segEnd, range)); - - timeT currentTime, propertyTime; - currentTime = segStart; - for (;;) { - bool fnd = getNextPropertyTime((*i), currentTime, propertyTime); - if (!fnd) break; -- insert(std::pair >(propertyTime, range)); -+ this->insert(std::pair >(propertyTime, range)); - currentTime = propertyTime; - } - } -diff -Nur rosegarden-11.11.42.orig/src/base/Sets.h rosegarden-11.11.42/src/base/Sets.h ---- rosegarden-11.11.42.orig/src/base/Sets.h 2011-12-11 21:09:32.000000000 +0100 -+++ rosegarden-11.11.42/src/base/Sets.h 2012-01-17 18:50:41.213404377 +0100 -@@ -349,7 +349,7 @@ - m_final = m_baseIterator; - sample(m_baseIterator, true); - -- if (getAsEvent(m_baseIterator)->isa(Note::EventType)) { -+ if (AbstractSet::getAsEvent(m_baseIterator)->isa(Note::EventType)) { - m_initialNote = m_baseIterator; - m_finalNote = m_baseIterator; - } -@@ -362,7 +362,7 @@ - for (i = j = m_baseIterator; i != getContainer().begin() && test(--j); i = j){ - if (sample(j, false)) { - m_initial = j; -- if (getAsEvent(j)->isa(Note::EventType)) { -+ if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) { - m_initialNote = j; - if (m_finalNote == getContainer().end()) { - m_finalNote = j; -@@ -379,7 +379,7 @@ - for (i = j = m_baseIterator; ++j != getContainer().end() && test(j); i = j) { - if (sample(j, true)) { - m_final = j; -- if (getAsEvent(j)->isa(Note::EventType)) { -+ if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) { - m_finalNote = j; - if (m_initialNote == getContainer().end()) { - m_initialNote = j; -@@ -397,17 +397,17 @@ - AbstractSet::sample(const Iterator &i, bool) - { - const Quantizer &q(getQuantizer()); -- Event *e = getAsEvent(i); -+ Event *e = AbstractSet::getAsEvent(i); - timeT d(q.getQuantizedDuration(e)); - - if (e->isa(Note::EventType) || d > 0) { - if (m_longest == getContainer().end() || -- d > q.getQuantizedDuration(getAsEvent(m_longest))) { -+ d > q.getQuantizedDuration(AbstractSet::getAsEvent(m_longest))) { - // std::cerr << "New longest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl; - m_longest = i; - } - if (m_shortest == getContainer().end() || -- d < q.getQuantizedDuration(getAsEvent(m_shortest))) { -+ d < q.getQuantizedDuration(AbstractSet::getAsEvent(m_shortest))) { - // std::cerr << "New shortest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl; - m_shortest = i; - } -@@ -417,12 +417,12 @@ - long p = get__Int(e, BaseProperties::PITCH); - - if (m_highest == getContainer().end() || -- p > get__Int(getAsEvent(m_highest), BaseProperties::PITCH)) { -+ p > get__Int(AbstractSet::getAsEvent(m_highest), BaseProperties::PITCH)) { - // std::cerr << "New highest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl; - m_highest = i; - } - if (m_lowest == getContainer().end() || -- p < get__Int(getAsEvent(m_lowest), BaseProperties::PITCH)) { -+ p < get__Int(AbstractSet::getAsEvent(m_lowest), BaseProperties::PITCH)) { - // std::cerr << "New lowest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl; - m_lowest = i; - } -@@ -441,8 +441,8 @@ - PropertyName stemUpProperty) : - AbstractSet(c, i, q), - m_stemUpProperty(stemUpProperty), -- m_time(q->getQuantizedAbsoluteTime(getAsEvent(i))), -- m_subordering(getAsEvent(i)->getSubOrdering()), -+ m_time(q->getQuantizedAbsoluteTime(GenericChord::getAsEvent(i))), -+ m_subordering(GenericChord::getAsEvent(i)->getSubOrdering()), - m_firstReject(c.end()) - { - // initialise must be called in individual derived classes. If we -@@ -471,7 +471,7 @@ - bool - GenericChord::test(const Iterator &i) - { -- Event *e = getAsEvent(i); -+ Event *e = GenericChord::getAsEvent(i); - if (AbstractSet:: - getQuantizer().getQuantizedAbsoluteTime(e) != m_time) { - return false; -@@ -507,7 +507,7 @@ - GenericChord::sample(const Iterator &i, - bool goingForwards) - { -- Event *e1 = getAsEvent(i); -+ Event *e1 = GenericChord::getAsEvent(i); - if (!e1->isa(Note::EventType)) { - if (goingForwards && m_firstReject == AbstractSet::getContainer().end()) m_firstReject = i; - return false; -@@ -527,7 +527,7 @@ - - if (AbstractSet::m_baseIterator != AbstractSet::getContainer().end()) { - -- Event *e0 = getAsEvent(AbstractSet::m_baseIterator); -+ Event *e0 = GenericChord::getAsEvent(AbstractSet::m_baseIterator); - - if (!(m_stemUpProperty == PropertyName::EmptyPropertyName)) { - -@@ -573,7 +573,7 @@ - } - - AbstractSet::sample(i, goingForwards); -- push_back(i); -+ this->push_back(i); - return true; - } - -@@ -615,7 +615,7 @@ - - for (unsigned int i = 0; i < std::vector::size(); ++i) { - -- Event *e = getAsEvent((*this)[i]); -+ Event *e = GenericChord::getAsEvent((*this)[i]); - std::vector marks(Marks::getMarks(*e)); - - for (std::vector::iterator j = marks.begin(); j != marks.end(); ++j) { -@@ -635,7 +635,7 @@ - - for (unsigned int i = 0; i < std::vector::size(); ++i) { - -- Event *e = getAsEvent((*this)[i]); -+ Event *e = GenericChord::getAsEvent((*this)[i]); - std::vector marks(Marks::getMarks(*e)); - - -@@ -662,9 +662,9 @@ - - for (typename std::vector::const_iterator - i = std::vector::begin(); i != std::vector::end(); ++i) { -- if (getAsEvent(*i)->has(BaseProperties::PITCH)) { -+ if (GenericChord::getAsEvent(*i)->has(BaseProperties::PITCH)) { - int pitch = get__Int -- (getAsEvent(*i), BaseProperties::PITCH); -+ (GenericChord::getAsEvent(*i), BaseProperties::PITCH); - if (pitches.size() > 0 && pitches[pitches.size()-1] == pitch) - continue; - pitches.push_back(pitch); -@@ -696,7 +696,7 @@ - while (1) { - if (i == AbstractSet::getContainer().begin()) return AbstractSet::getContainer().end(); - --i; -- if (getAsEvent(i)->isa(Note::EventType)) { -+ if (GenericChord::getAsEvent(i)->isa(Note::EventType)) { - return i; - } - } -@@ -710,7 +710,7 @@ - Iterator i(AbstractSet::getFinalElement()); - while ( i != AbstractSet::getContainer().end() && - ++i != AbstractSet::getContainer().end()) { -- if (getAsEvent(i)->isa(Note::EventType)) { -+ if (GenericChord::getAsEvent(i)->isa(Note::EventType)) { - return i; - } - } -@@ -732,8 +732,8 @@ - const Iterator &b) - { - try { -- long ap = get__Int(getAsEvent(a), BaseProperties::PITCH); -- long bp = get__Int(getAsEvent(b), BaseProperties::PITCH); -+ long ap = get__Int(GenericChord::getAsEvent(a), BaseProperties::PITCH); -+ long bp = get__Int(GenericChord::getAsEvent(b), BaseProperties::PITCH); - return (ap < bp); - } catch (Event::NoData) { - std::cerr << "Bad karma: PitchGreater failed to find one or both pitches" << std::endl; -diff -Nur rosegarden-11.11.42.orig/src/document/RosegardenDocument.cpp rosegarden-11.11.42/src/document/RosegardenDocument.cpp ---- rosegarden-11.11.42.orig/src/document/RosegardenDocument.cpp 2011-12-11 21:09:34.000000000 +0100 -+++ rosegarden-11.11.42/src/document/RosegardenDocument.cpp 2012-01-17 18:13:34.335452989 +0100 -@@ -2359,13 +2359,13 @@ - ++i) { - - Segment *s = i->second; -- Segment::iterator i = s->begin(); -+ Segment::iterator j = s->begin(); - -- if (i == s->end() || !(*i)->isa(Clef::EventType)) continue; -+ if (j == s->end() || !(*j)->isa(Clef::EventType)) continue; - -- if ((*i)->getAbsoluteTime() < meaningfulBarStart) { -- Event *e = new Event(**i, meaningfulBarStart); -- s->erase(i); -+ if ((*j)->getAbsoluteTime() < meaningfulBarStart) { -+ Event *e = new Event(**j, meaningfulBarStart); -+ s->erase(j); - s->insert(e); - } - } -diff -Nur rosegarden-11.11.42.orig/src/gui/application/LircClient.cpp rosegarden-11.11.42/src/gui/application/LircClient.cpp ---- rosegarden-11.11.42.orig/src/gui/application/LircClient.cpp 2011-12-11 21:09:16.000000000 +0100 -+++ rosegarden-11.11.42/src/gui/application/LircClient.cpp 2012-01-17 19:01:11.259390559 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - namespace Rosegarden - { -diff -Nur rosegarden-11.11.42.orig/src/gui/application/LircCommander.cpp rosegarden-11.11.42/src/gui/application/LircCommander.cpp ---- rosegarden-11.11.42.orig/src/gui/application/LircCommander.cpp 2011-12-11 21:09:16.000000000 +0100 -+++ rosegarden-11.11.42/src/gui/application/LircCommander.cpp 2012-01-17 18:56:50.373396313 +0100 -@@ -31,7 +31,7 @@ - #include "document/CommandHistory.h" - - #include -- -+#include - - namespace Rosegarden - { -diff -Nur rosegarden-11.11.42.orig/src/gui/application/main.cpp rosegarden-11.11.42/src/gui/application/main.cpp ---- rosegarden-11.11.42.orig/src/gui/application/main.cpp 2011-12-11 21:09:16.000000000 +0100 -+++ rosegarden-11.11.42/src/gui/application/main.cpp 2012-01-17 18:58:53.769393547 +0100 -@@ -49,6 +49,7 @@ - #include - - #include -+#include - - using namespace Rosegarden; - -diff -Nur rosegarden-11.11.42.orig/src/gui/editors/notation/Inconsistencies.h rosegarden-11.11.42/src/gui/editors/notation/Inconsistencies.h ---- rosegarden-11.11.42.orig/src/gui/editors/notation/Inconsistencies.h 2011-12-11 21:09:25.000000000 +0100 -+++ rosegarden-11.11.42/src/gui/editors/notation/Inconsistencies.h 2012-01-17 19:56:09.986318473 +0100 -@@ -52,11 +52,11 @@ - timeT end = comp->getEndMarker(); - - typename std::map >::iterator it; -- if (getFirst(start, end, it)) { -+ if (this->getFirst(start, end, it)) { - for (;;) { - timeT t1, t2; -- if (!isConsistent(it)) { -- getTimeRange(it, t1, t2); -+ if (!this->isConsistent(it)) { -+ this->getTimeRange(it, t1, t2); - int bar1 = comp->getBarNumber(t1) + 1; - int bar2 = comp->getBarNumber(t2) + 1; - str += QString("
"); -@@ -68,18 +68,18 @@ - } - - str += QString("
"); -- const std::vector *s = getSegments(it); -+ const std::vector *s = this->getSegments(it); - std::vector::const_iterator sit; - for (sit = s->begin(); sit != s->end(); ++sit) { - if (sit != s->begin()) str += QString("
"); - T pr = Overlaps::getPropertyAtTime(*sit, t1); - str+= segLine - .arg(QString::fromStdString((*sit)->getLabel())) -- .arg(getTranslatedName(pr)); -+ .arg(this->getTranslatedName(pr)); - } - str += QString("
"); - } -- if (!getNext(end, it)) break; -+ if (!this->getNext(end, it)) break; - } - } - } -diff -Nur rosegarden-11.11.42.orig/src/gui/studio/AudioPluginOSCGUIManager.cpp rosegarden-11.11.42/src/gui/studio/AudioPluginOSCGUIManager.cpp ---- rosegarden-11.11.42.orig/src/gui/studio/AudioPluginOSCGUIManager.cpp 2011-12-11 21:09:20.000000000 +0100 -+++ rosegarden-11.11.42/src/gui/studio/AudioPluginOSCGUIManager.cpp 2012-01-17 18:54:18.965399536 +0100 -@@ -37,7 +37,7 @@ - #include - - #include -- -+#include - - namespace Rosegarden - { -diff -Nur rosegarden-11.11.42.orig/src/sound/RingBuffer.h rosegarden-11.11.42/src/sound/RingBuffer.h ---- rosegarden-11.11.42.orig/src/sound/RingBuffer.h 2011-12-11 21:09:29.000000000 +0100 -+++ rosegarden-11.11.42/src/sound/RingBuffer.h 2012-01-17 18:15:33.906450378 +0100 -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - #include "Scavenger.h" - diff --git a/rosegarden.changes b/rosegarden.changes index 61b5b06..f28fc93 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 6 12:08:03 UTC 2013 - davejplater@gmail.com + +- Update to release 12.12.25 +- Removed patches rosegarden-10.02-plugin-lib64path.patch, + rosegarden-gcc47.patch and rosegarden-11.11-gplv2+.patch + now incorporated upstream. + ------------------------------------------------------------------- Sat Mar 24 18:17:43 UTC 2012 - dimstar@opensuse.org diff --git a/rosegarden.spec b/rosegarden.spec index 88d2b10..ec04808 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -35,19 +35,13 @@ BuildRequires: pkg-config BuildRequires: shared-mime-info BuildRequires: update-desktop-files BuildRequires: xorg-x11-util-devel -Version: 11.11.42 +Version: 12.12.25 Release: 0 Source0: http://downloads.sourceforge.net/project/%{name}/%name/11.11/%{name}-%{version}.tar.bz2 Source1: %{name}.xpm Source2: %{name}.1 -# This patch fixes the 64 bit lib search path for dssi and ladspa and is distro specific for now. -Patch0: rosegarden-10.02-plugin-lib64path.patch # This patch fixes the file search paths for examples, templates and midi driver libraries. Patch1: rosegarden-10.10-filepaths.patch -#Temporary patch to fix license statement in the "About box" -Patch2: rosegarden-11.11-gplv2+.patch -# PATCH-FIX-UPSTREAM rosegarden-gcc47.patch sf#3475088 -- Fix build with gcc 4.7 -Patch3: rosegarden-gcc47.patch Summary: Midi, Audio And Notation Editor License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Midi @@ -61,7 +55,7 @@ Requires: lilypond %else Recommends: lilypond %endif -Recommends: jack +Requires: jack BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,10 +73,7 @@ See the changelog for details. %prep %setup -q -%patch0 %patch1 -%patch2 -%patch3 -p1 # When we build svn we need to execute bootstrap.sh it doesn't harm the release build either. sh bootstrap.sh