packages: rosegarden/rosegarden.spec, rosegarden/rosegarden-dssi_lib64.patc...

[jajcus]

Author: jajcus                       Date: Tue Dec 15 09:01:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- default $DSSI_PATH fixed for 64-bit systems
- Release: 4

---- Files affected:
packages/rosegarden:
   rosegarden.spec (1.35 -> 1.36) , rosegarden-dssi_lib64.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rosegarden/rosegarden.spec
diff -u packages/rosegarden/rosegarden.spec:1.35 packages/rosegarden/rosegarden.spec:1.36
--- packages/rosegarden/rosegarden.spec:1.35	Tue Dec  8 21:25:03 2009
+++ packages/rosegarden/rosegarden.spec	Tue Dec 15 10:01:07 2009
@@ -10,13 +10,14 @@
 Summary(pl.UTF-8):	Rosegarden - interaktywny sekwencer MIDI i audio
 Name:		rosegarden
 Version:	1.7.3
-Release:	3
+Release:	4
 License:	GPL
 Group:		X11/Applications/Sound
 Source0:	http://dl.sourceforge.net/rosegarden/%{_name}-%{version}.tar.bz2
 # Source0-md5:	122eab42e375d2f3b009c8540ae8069c
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-link_order.patch
+Patch2:		%{name}-dssi_lib64.patch
 URL:		http://www.rosegardenmusic.com/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	cmake
@@ -54,6 +55,9 @@
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%if "%{_lib}" == "lib64"
+%patch2 -p1
+%endif
 
 %build
 export CMAKE_LIBRARY_PATH=%{_prefix}/lib/kde3dev
@@ -99,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2009/12/15 09:01:07  jajcus
+- default $DSSI_PATH fixed for 64-bit systems
+- Release: 4
+
 Revision 1.35  2009/12/08 20:25:03  jajcus
 - BR: dssi-devel >= 1.0.0
 - Release: 3

================================================================
Index: packages/rosegarden/rosegarden-dssi_lib64.patch
diff -u /dev/null packages/rosegarden/rosegarden-dssi_lib64.patch:1.1
--- /dev/null	Tue Dec 15 10:01:13 2009
+++ packages/rosegarden/rosegarden-dssi_lib64.patch	Tue Dec 15 10:01:07 2009
@@ -0,0 +1,12 @@
+diff -dur rosegarden-1.7.3.orig/src/sound/DSSIPluginFactory.cpp rosegarden-1.7.3/src/sound/DSSIPluginFactory.cpp
+--- rosegarden-1.7.3.orig/src/sound/DSSIPluginFactory.cpp	2009-02-08 05:20:13.000000000 +0100
++++ rosegarden-1.7.3/src/sound/DSSIPluginFactory.cpp	2009-12-15 09:57:52.000000000 +0100
+@@ -238,7 +238,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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rosegarden/rosegarden.spec?r1=1.35&r2=1.36&f=u