rpms/rosegarden4/devel rosegarden-1.5.1-desktop-file.patch, NONE, 1.1 rosegarden-1.5.1-lib64.patch, NONE, 1.1

[Callum Lerwick (seg)]

Author: seg

Update of /cvs/extras/rpms/rosegarden4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18471

Added Files:
	rosegarden-1.5.1-desktop-file.patch 
	rosegarden-1.5.1-lib64.patch 
Log Message:
Forgot to commit new patches.


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;
         }