diff --git a/.cvsignore b/.cvsignore index 35bb219..ea9cce9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rosegarden-1.4.0.tar.bz2 +rosegarden-1.5.1.tar.bz2 diff --git a/rosegarden-4-1.2.3-lib64.patch b/rosegarden-4-1.2.3-lib64.patch deleted file mode 100644 index 4b3ba4f..0000000 --- a/rosegarden-4-1.2.3-lib64.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur rosegarden-4-1.2.3.orig/sound/DSSIPluginFactory.cpp rosegarden-4-1.2.3/sound/DSSIPluginFactory.cpp ---- rosegarden-4-1.2.3.orig/sound/DSSIPluginFactory.cpp 2006-01-03 14:14:39.000000000 -0600 -+++ rosegarden-4-1.2.3/sound/DSSIPluginFactory.cpp 2006-07-16 23:18:08.000000000 -0500 -@@ -236,7 +236,7 @@ - if (cpath) path = cpath; - - if (path == "") { -- path = "/usr/local/lib/dssi:/usr/lib/dssi"; -+ path = "/usr/local/lib64/dssi:/usr/lib64/dssi"; - char *home = getenv("HOME"); - if (home) path = std::string(home) + "/.dssi:" + path; - } -diff -ur rosegarden-4-1.2.3.orig/sound/LADSPAPluginFactory.cpp rosegarden-4-1.2.3/sound/LADSPAPluginFactory.cpp ---- rosegarden-4-1.2.3.orig/sound/LADSPAPluginFactory.cpp 2006-01-03 14:14:39.000000000 -0600 -+++ rosegarden-4-1.2.3/sound/LADSPAPluginFactory.cpp 2006-07-16 23:16:16.000000000 -0500 -@@ -512,7 +512,7 @@ - if (cpath) path = cpath; - - if (path == "") { -- path = "/usr/local/lib/ladspa:/usr/lib/ladspa"; -+ path = "/usr/local/lib64/ladspa:/usr/lib64/ladspa"; - char *home = getenv("HOME"); - if (home) path = std::string(home) + "/.ladspa:" + path; - } -@@ -699,9 +699,9 @@ - std::vector path; - - for (size_t i = 0; i < pluginPath.size(); ++i) { -- if (pluginPath[i].contains("/lib/")) { -+ if (pluginPath[i].contains("/lib64/")) { - QString p(pluginPath[i]); -- p.replace("/lib/", "/share/"); -+ p.replace("/lib64/", "/share/"); - path.push_back(p); - // std::cerr << "LADSPAPluginFactory::generateFallbackCategories: path element " << p << std::endl; - } diff --git a/rosegarden-4-desktop-file.patch b/rosegarden-4-desktop-file.patch deleted file mode 100644 index 887e2e8..0000000 --- a/rosegarden-4-desktop-file.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur rosegarden-4-1.2.3/gui/rosegarden.desktop rosegarden-4-1.2.3.desktop/gui/rosegarden.desktop ---- rosegarden-4-1.2.3/gui/rosegarden.desktop 2004-05-22 03:06:53.000000000 -0500 -+++ rosegarden-4-1.2.3.desktop/gui/rosegarden.desktop 2006-06-17 01:39:46.000000000 -0500 -@@ -1,15 +1,12 @@ --# KDE Config File --[KDE Desktop Entry] -+[Desktop Entry] - Type=Application --Categories=AudioVideo;Application;X-SuSE-Sequencer;X-Red-Hat-Base; -+Categories=AudioVideo;Application; - Exec=rosegarden -caption "%c" %i %m - MimeType=audio/x-rosegarden;audio/x-rosegarden-device - X-KDE-NativeMimeType=audio/x-rosegarden - Icon=rosegarden.png --MiniIcon=rosegarden.png - DocPath=rosegarden/index.html - Comment=MIDI and Audio Sequencer and Editor --Comment[de]= --Terminal=0 -+Terminal=false - Name=Rosegarden --Name[de]=Rosegarden -+Encoding=UTF-8 -Only in rosegarden-4-1.2.3.desktop/gui: rosegarden.desktop~ diff --git a/rosegarden4.spec b/rosegarden4.spec index 919cb52..91404e6 100644 --- a/rosegarden4.spec +++ b/rosegarden4.spec @@ -1,21 +1,22 @@ Name: rosegarden4 -Version: 1.4.0 +Version: 1.5.1 Release: 1%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPL URL: http://www.rosegardenmusic.com/ Source0: http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2 -Patch0: rosegarden-4-desktop-file.patch -Patch1: rosegarden-4-1.2.3-lib64.patch +Patch0: rosegarden-1.5.1-desktop-file.patch +Patch1: rosegarden-1.5.1-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: scons +BuildRequires: cmake BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: kdelibs-devel -BuildRequires: liblo-devel +BuildRequires: fftw-devel BuildRequires: jack-audio-connection-kit-devel +BuildRequires: liblo-devel BuildRequires: ladspa-devel BuildRequires: liblrdf-devel BuildRequires: dssi-devel @@ -41,23 +42,24 @@ musicians, music students, and small studio or home recording environments. %endif %build -CFLAGS="%{optflags}" \ -CXXFLAGS="%{optflags}" \ -scons configure prefix=%{_prefix} -scons %{?_smp_mflags} +%cmake . +make VERBOSE=1 %{?_smp_mflags} %install rm -rf %{buildroot} -scons install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --delete-original \ - %{buildroot}%{_datadir}/applnk/Applications/rosegarden.desktop + %{buildroot}%{_datadir}/applications/rosegarden.desktop %find_lang rosegarden +%check +#ctest + %clean rm -rf %{buildroot} @@ -82,20 +84,21 @@ touch --no-create %{_datadir}/icons/locolor || : %defattr(-,root,root) %doc AUTHORS COPYING %{_bindir}/rosegarden +%{_bindir}/rosegarden-audiofile-importer %{_bindir}/rosegarden-lilypondview %{_bindir}/rosegarden-project-package %{_bindir}/rosegardensequencer %{_datadir}/applications/fedora-rosegarden.desktop %{_datadir}/apps/rosegarden/ %{_docdir}/HTML/*/rosegarden/ -%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.png +%{_datadir}/icons/hicolor/16x16/apps/rosegarden.png %{_datadir}/icons/hicolor/16x16/mimetypes/x-rosegarden.png %{_datadir}/icons/hicolor/32x32/apps/rosegarden.png %{_datadir}/icons/hicolor/32x32/mimetypes/x-rosegarden.png %{_datadir}/icons/hicolor/48x48/apps/rosegarden.png %{_datadir}/icons/hicolor/64x64/apps/rosegarden.png %{_datadir}/icons/hicolor/128x128/apps/rosegarden.png -%{_datadir}/icons/locolor/16x16/apps/x-rosegarden.xpm +%{_datadir}/icons/locolor/16x16/apps/rosegarden.xpm %{_datadir}/icons/locolor/16x16/mimetypes/x-rosegarden.png %{_datadir}/icons/locolor/32x32/apps/rosegarden.xpm %{_datadir}/icons/locolor/32x32/mimetypes/x-rosegarden.png @@ -105,6 +108,12 @@ touch --no-create %{_datadir}/icons/locolor || : %{_datadir}/mimelnk/audio/x-soundfont.desktop %changelog +* Wed May 02 2007 Callum Lerwick - 1.5.1-1 +- New upstream version. + +* Tue Feb 13 2007 Callum Lerwick - 1.5.0-1 +- New upstream version. + * Sat Nov 11 2006 Callum Lerwick - 1.4.0-1 - New upstream version. diff --git a/sources b/sources index 9e7b4ae..a8e233e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17a0e5a781ffe5d8c8bc8044573151c3 rosegarden-1.4.0.tar.bz2 +6bf152e54b62de22c67d9899e8f9d5c2 rosegarden-1.5.1.tar.bz2