packages: ZynAddSubFX/ZynAddSubFX.spec - up to 2.4.1 - restored docs - corr...

[lkrotowski]

Author: lkrotowski                   Date: Wed Dec  7 17:06:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.4.1
- restored docs
- corrected banks directory (name in lowercase in datadir)
- corrected br

---- Files affected:
packages/ZynAddSubFX:
   ZynAddSubFX.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/ZynAddSubFX/ZynAddSubFX.spec
diff -u packages/ZynAddSubFX/ZynAddSubFX.spec:1.19 packages/ZynAddSubFX/ZynAddSubFX.spec:1.20
--- packages/ZynAddSubFX/ZynAddSubFX.spec:1.19	Fri Dec 21 14:19:05 2007
+++ packages/ZynAddSubFX/ZynAddSubFX.spec	Wed Dec  7 18:06:31 2011
@@ -1,23 +1,22 @@
 # $Revision$, $Date$
-%define 	doc_ver	1.4.3
+%define 	namelc zynaddsubfx
 Summary:	Realtime software synthesizer
 Summary(pl.UTF-8):	Syntezator programowy działający w czasie rzeczywistym
 Name:		ZynAddSubFX
-Version:	2.2.1
+Version:	2.4.1
 Release:	1
 License:	GPL
 Group:		X11/Applications/Sound
-Source0:	http://dl.sourceforge.net/zynaddsubfx/%{name}-%{version}.tar.bz2
-# Source0-md5:	fca8560e37d799bd20d17e22b11674d6
-#Source1:	http://dl.sourceforge.net/zynaddsubfx/%{name}-doc-%{doc_ver}.tar.gz
-Source2:	%{name}.desktop
+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:	alsa-lib-devel
 BuildRequires:	fftw3-devel
 BuildRequires:	fltk-devel >= 1.1.3
 BuildRequires:	jack-audio-connection-kit-devel >= 0.66.3
-BuildRequires:	mxml >= 2.2
+BuildRequires:	mxml-devel >= 2.2
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	sed >= 4.0
@@ -45,27 +44,19 @@
 	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
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{namelc}} \
+	$RPM_BUILD_ROOT%{_desktopdir}
 
 install -c src/zynaddsubfx $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-mv banks/* examples/Banks
-cp -r examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
-
-# 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
+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
@@ -74,7 +65,7 @@
 %defattr(644,root,root,755)
 %doc FAQ.txt HISTORY.txt README.txt
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
+%{_datadir}/%{namelc}
 %{_desktopdir}/%{name}.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -83,6 +74,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/12/07 17:06:31  lkrotowski
+- up to 2.4.1
+- restored docs
+- corrected banks directory (name in lowercase in datadir)
+- corrected br
+
 Revision 1.19  2007/12/21 13:19:05  sls
 - added make-jN.patch
 - remove BR: XFree86-devel (fltk-devel is enough)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ZynAddSubFX/ZynAddSubFX.spec?r1=1.19&r2=1.20&f=u