- 2.1.1, STBR for Ac

Changed files:
    ZynAddSubFX.spec -> 1.7

diff --git a/ZynAddSubFX.spec b/ZynAddSubFX.spec
index aae1d844de534b09d0bdb34d2592238e4bc97915..8f1d499c70c080303dde818742eb1b8d004b5bfd 100644 (file)
--- a/ZynAddSubFX.spec
+++ b/ZynAddSubFX.spec
@@ -1,28 +1,24 @@
-#
-# Conditional build:
-# _with_jack           - build with jack audio connection kit
-#
 %define        doc_ver         1.4.3
 Summary:       Realtime software synthesizer
 Summary(pl):   Syntezator programowy dzia³aj±cy w czasie rzeczywistym
 Name:          ZynAddSubFX
-Version:       1.4.3
+Version:       2.1.1
 Release:       1
 License:       GPL
 Group:         X11/Applications/Sound
-Source0:       http://dl.sourceforge.net/sourceforge/zynaddsubfx/%{name}-%{version}.tar.gz
-# Source0-md5: 1d89e2f469f48ba046deeec8e38ed02f
-Source1:       http://dl.sourceforge.net/sourceforge/zynaddsubfx/%{name}-doc-%{doc_ver}.tar.gz
+Source0:       http://mesh.dl.sourceforge.net/sourceforge/zynaddsubfx/%{name}-%{version}.tar.bz2
+# Source0-md5: a078a85fc140bad8da6dd8114b9e5f41
+Source1:       http://mesh.dl.sourceforge.net/sourceforge/zynaddsubfx/%{name}-doc-%{doc_ver}.tar.gz
 # Source1-md5: 64a1c8d991e7ec9ffe0f9fbf929af62f
 Source2:       %{name}.desktop
-Patch0:                %{name}-jack.patch
-Patch1:                %{name}-optflags.patch
 URL:           http://zynaddsubfx.sourceforge.net/
 BuildRequires: XFree86-devel
 BuildRequires: alsa-lib-devel
-BuildRequires: fftw-devel
+BuildRequires: fftw3-devel
 BuildRequires: fltk-devel >= 1.1.3
-%{?_with_jack:BuildRequires:   jack-audio-connection-kit-devel >= 0.66.3}
+BuildRequires: jack-audio-connection-kit-devel >= 0.66.3
+BuildRequires: mxml >= 2.0
+BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,35 +31,38 @@ niezliczonej ilo
 
 %prep
 %setup -q -a1
-%{?_with_jack:%patch0 -p1}
-%patch1 -p1
+sed -i -e "s|-O6|\$(OPTFLAGS)|" src/Makefile
 
 %build
 cd src
-%{__make} OPTFLAGS="%{rpmcflags}"
+%{__make} OPTFLAGS="%{rpmcflags}" \
+       LINUX_AUDIOOUT="OSS_AND_JACK" \
+       CXX=%{__cxx}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}} \
        $RPM_BUILD_ROOT%{_desktopdir} \
        $RPM_BUILD_ROOT%{_datadir}/%{name}/images \
+       $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/Banks \
        $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/Instruments \
        $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/Scales
 
 install -c src/zynaddsubfx $RPM_BUILD_ROOT%{_bindir}
-cd %{name}-doc-%{doc_ver}
-bzip2 -dc demo_src.tar.bz2 | tar xf - -C ../examples
-cp images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
-cp *.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp *.html $RPM_BUILD_ROOT%{_datadir}/%{name}
-cd ..
-cp examples/*.*zyn $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
-cp examples/demo_src/*.*zyn $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
-cp examples/Instruments/*.*zyn $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/Instruments
-cp examples/Scales/*.*zyn $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/Scales
-
+cp examples/*.xmz $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 
+# NOTE:
+# Outdated, new version not ready yet
+#
+#cd %{name}-doc-%{doc_ver}
+#bzip2 -dc demo_src.tar.bz2 | tar xf - -C ../examples
+#cp images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
+#cp *.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}
+#cp *.html $RPM_BUILD_ROOT%{_datadir}/%{name}
+#cd ..
+#cp examples/demo_src/*.*zyn $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/demos
+
 %clean
 rm -rf $RPM_BUILD_ROOT