packages: roaraudio/roaraudio.spec - yiff fixes - fix bcond subpackages

[glen]

Author: glen                         Date: Sun Apr 11 23:38:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- yiff fixes
- fix bcond subpackages

---- Files affected:
packages/roaraudio:
   roaraudio.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/roaraudio/roaraudio.spec
diff -u packages/roaraudio/roaraudio.spec:1.6 packages/roaraudio/roaraudio.spec:1.7
--- packages/roaraudio/roaraudio.spec:1.6	Mon Apr 12 01:25:56 2010
+++ packages/roaraudio/roaraudio.spec	Mon Apr 12 01:38:30 2010
@@ -13,12 +13,12 @@
 %bcond_without	nas     	# without NAS audio output
 %bcond_without	pulseaudio  # without pulseaudio output
 %bcond_without	sndfile		# without sndfile output
-%bcond_without	yiff		# ...
+%bcond_without	yiff		# without YIFF sound server support
 %bcond_without	xmms		# don't build XMMS plugin
 %bcond_without	audacious	# without audacious player support module
 
 # celt version required for roaraudio
-%define celt_release 0.7.1
+%define celt_release 0.6.1
 
 %define		subver	beta4
 %define		rel		0.1
@@ -33,7 +33,7 @@
 # Source0-md5:	001e5d9ecc65d80e14486d5157eb5d42
 %{?with_arts:BuildRequires:	arts-devel}
 %{?with_audacious:BuildRequires: audacious-devel}
-#BuildRequires:	celt-devel >= %{celt_release}
+BuildRequires:	celt-devel >= %{celt_release}
 %{?with_esd:BuildRequires:	esound-devel}
 BuildRequires:	libao-devel
 BuildRequires:	libdnet-devel
@@ -51,6 +51,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	speex-devel >= 1:1.2
 %{?with_xmms:BuildRequires:	xmms-devel}
+%{?with_yiff:BuildRequires:	yiff-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,7 +72,7 @@
 %package -n libroar-devel
 Summary:	RoarAudio sound system header files and libraries
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	libroar = %{version}-%{release}
 
 %description -n libroar-devel
 This package contains static libraries and header files needed to
@@ -175,6 +176,15 @@
 This package contains the sndfile compatibility system for the
 RoarAudio sound system.
 
+%package compat-yiff
+Summary:	RoarAudio sound system compatibility system for YIFF
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description compat-yiff
+This package contains the YIFF compatibility system for the RoarAudio
+sound system.
+
 %prep
 %setup -q -n %{name}-%{version}%{subver}
 
@@ -245,6 +255,9 @@
 %post	compat-arts -p /sbin/ldconfig
 %postun	compat-arts -p /sbin/ldconfig
 
+%post	compat-pulseaudio -p /sbin/ldconfig
+%postun	compat-pulseaudio -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog HACKING README TODO
@@ -280,9 +293,6 @@
 %{_mandir}/man1/roarvorbis.1*
 %{_mandir}/man7/*.7*
 
-%attr(755,root,root) %{_bindir}/yiff
-%attr(755,root,root) %{_bindir}/yplay
-%attr(755,root,root) %{_bindir}/yshutdown
 %attr(755,root,root) %{_libdir}/libroaross.so
 %attr(755,root,root) %ghost %{_libdir}/libroaross.so.0
 %attr(755,root,root) %{_libdir}/libroaross.so.*.*.*
@@ -352,6 +362,7 @@
 %attr(755,root,root) %{xmms_output_plugindir}/libroar.so
 %endif
 
+%if %{with esd}
 %files compat-esound
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/esd
@@ -369,6 +380,7 @@
 %attr(755,root,root) %{_libdir}/libesd.so
 %attr(755,root,root) %{_libdir}/libesd.so.0.2
 %attr(755,root,root) %{_libdir}/libesd.so.0.2.36
+%endif
 
 %if %{with arts}
 %files compat-arts
@@ -376,19 +388,22 @@
 %attr(755,root,root) %{_bindir}/artscat
 %attr(755,root,root) %{_bindir}/artsd
 %attr(755,root,root) %{_bindir}/artsplay
-%attr(755,root,root) %{_libdir}/libroarartsc.so
 # compat libs pointing to libroarpulse
 %attr(755,root,root) %{_libdir}/libartsc.so.0
 # needed?
 %attr(755,root,root) %{_libdir}/libartsc.so
 %attr(755,root,root) %{_libdir}/libartsc.so.0.0
 %attr(755,root,root) %{_libdir}/libartsc.so.0.0.0
+%attr(755,root,root) %{_libdir}/libroarartsc.so
 %endif
 
+%if %{with nas}
 %files compat-nas
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/auplay
+%endif
 
+%if %{with pulseaudio}
 %files compat-pulseaudio
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pacat
@@ -409,12 +424,30 @@
 %attr(755,root,root) %{_libdir}/libpulse.so.0.1.0
 %attr(755,root,root) %{_libdir}/libpulse.so.0.4
 %attr(755,root,root) %{_libdir}/libpulse.so.0.4.1
+%endif
 
+%if %{with sndfile}
 %files compat-sndfile
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libroarsndio.so
 %attr(755,root,root) %ghost %{_libdir}/libroarsndio.so.0
 %attr(755,root,root) %{_libdir}/libroarsndio.so.*.*.*
+# needed?
+%attr(755,root,root) %{_libdir}/libroarsndio.so
+%endif
+
+%if %{with yiff}
+%files compat-yiff
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/yiff
+%attr(755,root,root) %{_bindir}/yplay
+%attr(755,root,root) %{_bindir}/yshutdown
+%attr(755,root,root) %ghost %{_libdir}/libroaryiff.so.0
+%attr(755,root,root) %{_libdir}/libroaryiff.so.*.*.*
+%attr(755,root,root) %{_libdir}/libY2.so.14
+# needed?
+%attr(755,root,root) %{_libdir}/libY2.so
+%attr(755,root,root) %{_libdir}/libroaryiff.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -422,6 +455,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/04/11 23:38:30  glen
+- yiff fixes
+- fix bcond subpackages
+
 Revision 1.6  2010/04/11 23:25:56  glen
 - soe files/manuals resorted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roaraudio/roaraudio.spec?r1=1.6&r2=1.7&f=u