X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ZynAddSubFX.spec;h=32a36bb4366ef85f3557491c0828a102587ea3c2;hb=c89dac13f5afbeb15a0c1bb4b3d09f12c8f35f56;hp=8966e5c25fe7dd210d6a941bc91fbc5f6267a313;hpb=812cc495fe188338c0ce6b94cf104c94b2cfb9bc;p=packages%2FZynAddSubFX.git

diff --git a/ZynAddSubFX.spec b/ZynAddSubFX.spec
index 8966e5c..32a36bb 100644
--- a/ZynAddSubFX.spec
+++ b/ZynAddSubFX.spec
@@ -1,68 +1,61 @@
-#
-# Conditional build:
-# _with_jack		- build with jack audio connection kit
-#
-%define 	doc_ver  1.4.2
+%define 	namelc zynaddsubfx
 Summary:	Realtime software synthesizer
-Summary(pl):	Syntezator programowy dzia³aj±cy w czasie rzeczywistym
+Summary(pl.UTF-8):	Syntezator programowy działający w czasie rzeczywistym
 Name:		ZynAddSubFX
-Version:	1.4.2
+Version:	2.4.1
 Release:	1
 License:	GPL
 Group:		X11/Applications/Sound
-Source0:	http://dl.sourceforge.net/sourceforge/zynaddsubfx/%{name}-%{version}.tar.gz
-# Source0-md5:	0e071d5c9babf4cae71677bdb3805c29
-Source1:	http://dl.sourceforge.net/sourceforge/zynaddsubfx/%{name}-doc-%{doc_ver}.tar.gz
-# Source1-md5:	fadaab515d02517fbbc3014164e4aca2
-Source2:	%{name}.desktop
-Patch0:		%{name}-jack.patch
-Patch1:		%{name}-optflags.patch
+Source0:	http://dl.sourceforge.net/%{namelc}/%{name}-%{version}.tar.bz2
+# Source0-md5:	59eb69ce24d6f8c605f8ba43958d0526
+Source1:	%{name}.desktop
+Patch0:		%{name}-make-jN.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-devel >= 2.2
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 ZynAddSubFX is a software synthesizer capable of making a countless
 number of instruments.
 
-%description -l pl
+%description -l pl.UTF-8
 ZynAddSubFX jest programowym syntezatorem zdolnym do tworzenia
-niezliczonej ilo¶ci instrumentów.
+niezliczonej ilości instrumentów.
 
 %prep
-%setup -q -a1
-%{?_with_jack:%patch0 -p1}
-%patch1 -p1
+%setup -q
+%patch0 -p1
+sed -i -e "s|-O6|\$(OPTFLAGS)|" src/Makefile
 
 %build
-cd src
-%{__make} OPTFLAGS="%{rpmcflags}"
+%{__make} -C src \
+%ifnarch %{ix86} %{x8664}
+	ASM_F2I=NO \
+%endif
+	OPTFLAGS="%{rpmcflags}" \
+	LINUX_AUDIOOUT="OSS_AND_JACK" \
+	CXX="%{__cxx}"
+
+%{__make} -C doc
 
 %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/Instruments \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/Scales
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{namelc}} \
+	$RPM_BUILD_ROOT%{_desktopdir}
 
 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
-
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install -c doc/%{namelc}.html $RPM_BUILD_ROOT%{_datadir}/%{namelc}
+cp -r examples $RPM_BUILD_ROOT%{_datadir}/%{namelc}/
+cp -r banks $RPM_BUILD_ROOT%{_datadir}/%{namelc}/
+cp -r doc/images $RPM_BUILD_ROOT%{_datadir}/%{namelc}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,5 +64,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc FAQ.txt HISTORY.txt README.txt
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
+%{_datadir}/%{namelc}
 %{_desktopdir}/%{name}.desktop