- default DSSI_PATH fixed for the jack host on 64-bit systems

- Release: 2

Changed files:
    dssi-lib64.patch -> 1.1
    dssi.spec -> 1.13

diff --git a/dssi-lib64.patch b/dssi-lib64.patch
new file mode 100644 (file)
index 0000000..eff209e
--- /dev/null
+++ b/dssi-lib64.patch
@@ -0,0 +1,29 @@
+diff -durN dssi-1.0.0.orig/doc/jack-dssi-host.1 dssi-1.0.0/doc/jack-dssi-host.1
+--- dssi-1.0.0.orig/doc/jack-dssi-host.1       2009-01-05 21:43:48.000000000 +0100
++++ dssi-1.0.0/doc/jack-dssi-host.1    2009-12-15 09:52:42.000000000 +0100
+@@ -91,8 +91,8 @@
+ .B DSSI_PATH,
+ which is a colon-separated list of directories. If
+ .B DSSI_PATH
+-is not set, a default search path of /usr/lib/dssi,
+-/usr/local/lib/dssi, and (assuming the environment variable HOME is
++is not set, a default search path of /usr/lib64/dssi,
++/usr/local/lib64/dssi, and (assuming the environment variable HOME is
+ set,) $HOME/.dssi is used.
+ .br
+ .SH AUTHOR
+diff -durN dssi-1.0.0.orig/jack-dssi-host/jack-dssi-host.c dssi-1.0.0/jack-dssi-host/jack-dssi-host.c
+--- dssi-1.0.0.orig/jack-dssi-host/jack-dssi-host.c    2009-01-04 22:48:26.000000000 +0100
++++ dssi-1.0.0/jack-dssi-host/jack-dssi-host.c 2009-12-15 09:53:01.000000000 +0100
+@@ -493,9 +493,9 @@
+           const char *home = getenv("HOME");
+           if (home) {
+               defaultDssiPath = malloc(strlen(home) + 60);
+-              sprintf(defaultDssiPath, "/usr/local/lib/dssi:/usr/lib/dssi:%s/.dssi", home);
++              sprintf(defaultDssiPath, "/usr/local/lib64/dssi:/usr/lib64/dssi:%s/.dssi", home);
+           } else {
+-              defaultDssiPath = strdup("/usr/local/lib/dssi:/usr/lib/dssi");
++              defaultDssiPath = strdup("/usr/local/lib64/dssi:/usr/lib64/dssi");
+           }
+       }
+       dssiPath = defaultDssiPath;

diff --git a/dssi.spec b/dssi.spec
index 1787201dba6a16c1a4b15e1ceb5f18ff101bf8cc..242d15367c9f8fac5ca9bad15a8ab3d5ed747371 100644 (file)
--- a/dssi.spec
+++ b/dssi.spec
@@ -2,12 +2,13 @@ Summary:      Disposable Soft Synth Interface specification
 Summary(pl.UTF-8):     Specyfikacja Disposable Soft Synth Interface
 Name:          dssi
 Version:       1.0.0
 Summary(pl.UTF-8):     Specyfikacja Disposable Soft Synth Interface
 Name:          dssi
 Version:       1.0.0

-Release:       1
+Release:       2

 License:       LGPL v2.1
 Group:         Development/Libraries
 Source0:       http://dl.sourceforge.net/dssi/%{name}-%{version}.tar.gz
 # Source0-md5: bc4c50f9f9b3cd13019718266f8f15af
 Patch0:                %{name}-qt_test.patch
 License:       LGPL v2.1
 Group:         Development/Libraries
 Source0:       http://dl.sourceforge.net/dssi/%{name}-%{version}.tar.gz
 # Source0-md5: bc4c50f9f9b3cd13019718266f8f15af
 Patch0:                %{name}-qt_test.patch

+Patch1:                %{name}-lib64.patch

 URL:           http://dssi.sourceforge.net/
 BuildRequires: alsa-lib-devel >= 0.9
 BuildRequires: autoconf
 URL:           http://dssi.sourceforge.net/
 BuildRequires: alsa-lib-devel >= 0.9
 BuildRequires: autoconf


@@ -95,6 +96,9 @@ Przykładowe wtyczki DSSI
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%if "%{_lib}" == "lib64"
+%patch1 -p1
+%endif

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}