diff --git a/.gitignore b/.gitignore index 9f81f1b..9f1dac5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /muse-2.0beta2.tar.gz /muse-2.0rc1.tar.gz /muse-2.0rc2.tar.gz +/muse-2.0.tar.gz diff --git a/muse-gcc47.patch b/muse-gcc47.patch deleted file mode 100644 index 0d77685..0000000 --- a/muse-gcc47.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 sList; - typedef std::list::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 37d0e46..716ea68 100644 --- a/muse.spec +++ b/muse.spec @@ -1,4 +1,6 @@ -%global prerelease rc2 +# No need to provide internal libraries +%filter_provides_in %{_libdir}/%{name}-%{version}.*/.*/.*\.so$ +%filter_setup Name: muse Summary: Midi/Audio Music Sequencer @@ -6,7 +8,7 @@ Summary: Midi/Audio Music Sequencer # See: https://fedoraproject.org/wiki/AudioCreation Epoch: 1 Version: 2.0 -Release: 0.8.%{prerelease}%{?dist} +Release: 1%{?dist} # original freeverb plugin was public domain # ladspa.h is LGPLv2+ # givertcap (not built) is GPLv2 @@ -14,9 +16,7 @@ Release: 0.8.%{prerelease}%{?dist} 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 -# Gcc-4.7 compile fix. From upstream trunk r1377 -Patch0: muse-gcc47.patch +Source0: https://downloads.sourceforge.net/project/lmuse/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: alsa-lib-devel BuildRequires: cmake @@ -42,13 +42,14 @@ for Linux. %prep -%setup -q -n %{name}-%{version}%{?prerelease} -%patch0 -p1 -b .gcc47 +%setup -q -n %{name}-%{version} %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake} .. -DMusE_DOC_DIR=%{_docdir}/%{name}-%{version}/ +%{cmake} .. \ + -DMusE_DOC_DIR=%{_docdir}/%{name}-%{version}/ \ + -DENABLE_PYTHON=1 make %{?_smp_mflags} @@ -88,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/mime/packages/muse.xml %changelog +* Sun Jul 02 2012 Orcan Ogetbil - 1:2.0-1 +- MusE-2.0 final! + * Tue Feb 28 2012 Fedora Release Engineering - 1:2.0-0.8.rc2 - Rebuilt for c++ ABI breakage diff --git a/sources b/sources index f82b203..e5e9beb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ddcac479696db8cc4d291e2a6881f92 muse-2.0rc2.tar.gz +7338b9db1d7fb12f8310dced0dbd0572 muse-2.0.tar.gz