- add gui bcond to build without qt4 BR

- add libx32 patch for x32 arch

diff --git a/dssi-libx32.patch b/dssi-libx32.patch
new file mode 100644 (file)
index 0000000..abea3aa
--- /dev/null
+++ b/dssi-libx32.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/libx32/dssi,
++/usr/local/libx32/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/libx32/dssi:/usr/libx32/dssi:%s/.dssi", home);
+           } else {
+-              defaultDssiPath = strdup("/usr/local/lib/dssi:/usr/lib/dssi");
++              defaultDssiPath = strdup("/usr/local/libx32/dssi:/usr/libx32/dssi");
+           }
+       }
+       dssiPath = defaultDssiPath;

diff --git a/dssi.spec b/dssi.spec
index b8a1aef38c4c9be02c8501752c809cb5f17b5b9f..9c3630991f879bd00642cad7d44d4db989ff8415 100644 (file)
--- a/dssi.spec
+++ b/dssi.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without gui             # don't build gui examples (require qt4)
+#
 Summary:       Disposable Soft Synth Interface specification
 Summary(pl.UTF-8):     Specyfikacja Disposable Soft Synth Interface
 Name:          dssi
@@ -8,9 +12,13 @@ Group:                Development/Libraries
 Source0:       http://downloads.sourceforge.net/dssi/%{name}-%{version}.tar.gz
 # Source0-md5: 619ab73c883b02dc37ddb37001591f8b
 Patch0:                %{name}-lib64.patch
+Patch1:                %{name}-libx32.patch
 URL:           http://dssi.sourceforge.net/
+%if %{with gui}
 BuildRequires: QtCore-devel >= 4.0.1
 BuildRequires: QtGui-devel >= 4.0.1
+BuildRequires: qt4-build >= 4.0.1
+%endif
 BuildRequires: alsa-lib-devel >= 0.9
 BuildRequires: autoconf
 BuildRequires: automake
@@ -21,7 +29,6 @@ BuildRequires:        libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: qt4-build >= 4.0.1
 BuildRequires: xorg-lib-libX11-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -99,6 +106,9 @@ Przykładowe wtyczki DSSI
 %if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif
+%if "%{_lib}" == "libx32"
+%patch1 -p1
+%endif
 
 %build
 %{__libtoolize}
@@ -148,7 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/trivial_sampler
 %attr(755,root,root) %{_bindir}/trivial_synth
 %attr(755,root,root) %{_libdir}/dssi/*.so
+%if %{with gui}
 %dir %{_libdir}/dssi/less_trivial_synth
 %attr(755,root,root) %{_libdir}/dssi/less_trivial_synth/*_qt
 %dir %{_libdir}/dssi/trivial_sampler
 %attr(755,root,root) %{_libdir}/dssi/trivial_sampler/*_qt
+%endif