rpms/rosegarden4/FC-6 rosegarden-1.5.1-desktop-file.patch, NONE, 1.1 rosegarden-1.5.1-lib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rosegarden4.spec, 1.4, 1.5 sources, 1.3, 1.4 rosegarden-4-1.2.3-lib64.patch, 1.1, NONE rosegarden-4-desktop-file.patch, 1.1, NONE

Callum Lerwick (seg) fedora-extras-commits at redhat.com
Tue May 8 23:56:06 UTC 2007 

Author: seg

Update of /cvs/extras/rpms/rosegarden4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25250

Modified Files:
	.cvsignore rosegarden4.spec sources 
Added Files:
	rosegarden-1.5.1-desktop-file.patch 
	rosegarden-1.5.1-lib64.patch 
Removed Files:
	rosegarden-4-1.2.3-lib64.patch rosegarden-4-desktop-file.patch 
Log Message:
* Wed May 02 2007 Callum Lerwick <seg at haxxed.com> - 1.5.1-1
- New upstream version.


rosegarden-1.5.1-desktop-file.patch:

--- NEW FILE rosegarden-1.5.1-desktop-file.patch ---
diff -ur rosegarden-1.5.1/data/desktop/rosegarden.desktop rosegarden.patched/data/desktop/rosegarden.desktop
--- rosegarden-1.5.1/data/desktop/rosegarden.desktop	2007-03-13 07:50:32.000000000 -0500
+++ rosegarden.patched/data/desktop/rosegarden.desktop	2007-05-05 02:48:16.000000000 -0500
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Categories=AudioVideo;Audio;Midi;Sequencer;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
Only in rosegarden.patched/data/desktop: rosegarden.desktop~
Only in rosegarden.patched/data/desktop: rosegarden.desktop.orig
Only in rosegarden.patched/data/desktop: rosegarden.desktop.rej
Only in rosegarden.patched/src/sound: DSSIPluginFactory.cpp~
Only in rosegarden.patched/src/sound: DSSIPluginFactory.cpp.orig
Only in rosegarden.patched/src/sound: DSSIPluginFactory.cpp.rej
Only in rosegarden.patched/src/sound: LADSPAPluginFactory.cpp~
Only in rosegarden.patched/src/sound: LADSPAPluginFactory.cpp.orig
Only in rosegarden.patched/src/sound: LADSPAPluginFactory.cpp.rej

rosegarden-1.5.1-lib64.patch:

--- NEW FILE rosegarden-1.5.1-lib64.patch ---
diff -ur rosegarden-1.5.1/src/sound/DSSIPluginFactory.cpp rosegarden.patched/src/sound/DSSIPluginFactory.cpp
--- rosegarden-1.5.1/src/sound/DSSIPluginFactory.cpp	2007-03-13 07:50:32.000000000 -0500
+++ rosegarden.patched/src/sound/DSSIPluginFactory.cpp	2007-05-02 16:53:10.000000000 -0500
@@ -243,7 +243,7 @@
         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-1.5.1/src/sound/LADSPAPluginFactory.cpp rosegarden.patched/src/sound/LADSPAPluginFactory.cpp
--- rosegarden-1.5.1/src/sound/LADSPAPluginFactory.cpp	2007-03-13 07:50:32.000000000 -0500
+++ rosegarden.patched/src/sound/LADSPAPluginFactory.cpp	2007-05-02 16:53:52.000000000 -0500
@@ -527,7 +527,7 @@
         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;
@@ -722,9 +722,9 @@
     std::vector<QString> 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;
         }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2006 05:29:35 -0000	1.3
+++ .cvsignore	8 May 2007 23:55:31 -0000	1.4
@@ -1 +1 @@
-rosegarden-1.4.0.tar.bz2
+rosegarden-1.5.1.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/rosegarden4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rosegarden4.spec	15 Nov 2006 05:29:35 -0000	1.4
+++ rosegarden4.spec	8 May 2007 23:55:31 -0000	1.5
@@ -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 @@
 %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 @@
 %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 @@
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
 %changelog
+* Wed May 02 2007 Callum Lerwick <seg at haxxed.com> - 1.5.1-1
+- New upstream version.
+
+* Tue Feb 13 2007 Callum Lerwick <seg at haxxed.com> - 1.5.0-1
+- New upstream version.
+
 * Sat Nov 11 2006 Callum Lerwick <seg at haxxed.com> - 1.4.0-1
 - New upstream version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2006 05:29:35 -0000	1.3
+++ sources	8 May 2007 23:55:31 -0000	1.4
@@ -1 +1 @@
-17a0e5a781ffe5d8c8bc8044573151c3  rosegarden-1.4.0.tar.bz2
+6bf152e54b62de22c67d9899e8f9d5c2  rosegarden-1.5.1.tar.bz2


--- rosegarden-4-1.2.3-lib64.patch DELETED ---


--- rosegarden-4-desktop-file.patch DELETED ---

More information about the fedora-extras-commits mailing list