SPECS: esound.spec - alsa support by default, rel.5

[freetz]

Author: freetz                       Date: Fri Apr 21 16:03:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alsa support by default, rel.5

---- Files affected:
SPECS:
   esound.spec (1.114 -> 1.115) 

---- Diffs:

================================================================
Index: SPECS/esound.spec
diff -u SPECS/esound.spec:1.114 SPECS/esound.spec:1.115
--- SPECS/esound.spec:1.114	Thu Apr 20 19:33:59 2006
+++ SPECS/esound.spec	Fri Apr 21 18:02:55 2006
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	alsa 		# don't build ALSA version
 %bcond_without	libwrap 	# without hosts.{access,deny} support
 #
 Summary:	The Enlightened Sound Daemon
@@ -13,7 +12,7 @@
 Summary(uk):	óĹŇ×ĹŇ, ÝĎ ÄĎÚ×ĎĚѤ ÍŚËŰÉŇŐ×ÁÔÉ ×É×ŚÄ ÎÁ Ú×ŐËĎ×ÉĘ ĐŇÉÓÔŇŚĘ
 Name:		esound
 Version:	0.2.36
-Release:	4
+Release:	5
 Epoch:		1
 License:	GPL
 Group:		Daemons
@@ -23,7 +22,7 @@
 Patch1:		%{name}-etc_dir.patch
 Patch2:		%{name}-auto_spawn.patch
 URL:		http://www.tux.org/~ricdude/EsounD.html
-%{?with_alsa:BuildRequires:	alsa-lib-devel >= 1.0.0}
+BuildRequires:	alsa-lib-devel >= 1.0.0
 BuildRequires:	audiofile-devel >= 1:0.2.0
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -33,11 +32,9 @@
 %{?with_libwrap:BuildRequires:	libwrap-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
-Obsoletes:	libesound0
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoprov	libesd.so.0
-
 %description
 The Enlightened Sound Daemon is a server process that allows multiple
 applications to share a single sound card.
@@ -71,12 +68,9 @@
 Summary:	EsounD libraries
 Summary(pl):	Biblioteki EsounD
 Group:		Libraries
-Requires:	%{name}-driver
-%ifarch %{x8664} ia64 ppc64 s390x sparc64
-Provides:	libesd.so.0()(64bit)
-%else
-Provides:	libesd.so.0
-%endif
+Obsoletes:	esound-alsa
+Obsoletes:	esound-oss
+Obsoletes:	libesound0
 
 %description libs
 EsounD libraries.
@@ -94,7 +88,7 @@
 Summary(uk):	âŚÂĚŚĎÔĹËÉ ŇĎÚŇĎÂËÉ ÄĚŃ esound
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-%{?with_alsa:Requires:	alsa-lib-devel >= 1.0.0-pre1}
+Requires:	alsa-lib-devel >= 1.0.0-pre1
 Requires:	audiofile-devel
 Obsoletes:	libesound0-devel
 
@@ -157,38 +151,6 @@
 ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÓÔÁÔÉŢÎŚ ÂŚÂĚŚĎÔĹËÉ, ÎĹĎÂČŚÄÎŚ ÄĚŃ ŇĎÚŇĎÂËÉ
 ĐŇÉËĚÁÄÎÉČ ĐŇĎÇŇÁÍ, ÝĎ ×ÉËĎŇÉÓÔĎ×ŐŔÔŘ esound.
 
-%package oss
-Summary:	EsounD OSS driver
-Summary(pl):	Sterownik OSS dla EsoundD
-Group:		Libraries
-Requires(post):	/sbin/ldconfig
-Requires(post):	fileutils
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Provides:	%{name}-driver
-Obsoletes:	%{name}-alsa
-
-%description oss
-EsounD OSS driver.
-
-%description oss -l pl
-Sterownik OSS dla EsoundD.
-
-%package alsa
-Summary:	EsounD ALSA driver
-Summary(pl):	Sterownik ALSA dla EsoundD
-Group:		Libraries
-Requires(post):	/sbin/ldconfig
-Requires(post):	fileutils
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Provides:	%{name}-driver
-Obsoletes:	%{name}-oss
-
-%description alsa
-EsounD ALSA driver.
-
-%description alsa -l pl
-Sterownik ALSA dla EsoundD.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -201,24 +163,13 @@
 %{__autoconf}
 %{__automake}
 
-%if %{with alsa}
 %configure \
 	--enable-ipv6 \
 	--with%{!?with_libwrap:out}-libwrap \
 	--enable-alsa \
+	--enable-oss \
 	--enable-local-sound
 %{__make}
-cp -f .libs/libesd.so.%{version} libesd-alsa.so.%{version}
-%{__make} clean
-%endif
-
-%configure \
-	--enable-ipv6 \
-	--with%{!?with_libwrap:out}-libwrap \
-	--disable-alsa \
-	--enable-local-sound
-%{__make}
-cp -f .libs/libesd.so.%{version} libesd-oss.so.%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -228,27 +179,12 @@
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
-install libesd-*.so.*.* $RPM_BUILD_ROOT%{_libdir}
-> $RPM_BUILD_ROOT%{_libdir}/libesd.so.%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs	-p /sbin/ldconfig
+%post	libs	-p /sbin/ldconfig
 %postun libs	-p /sbin/ldconfig
 
-%post oss
-ln -fs libesd-oss.so.%{version} %{_libdir}/libesd.so.%{version}
-/sbin/ldconfig
-
-%postun oss -p /sbin/ldconfig
-
-%post alsa
-ln -fs libesd-alsa.so.%{version} %{_libdir}/libesd.so.%{version}
-/sbin/ldconfig
-
-%postun alsa -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TIPS TODO docs/html
@@ -268,8 +204,7 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libesddsp.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libesd.so.%{version}
+%attr(755,root,root) %{_libdir}/libesd*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
@@ -285,22 +220,15 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%files oss
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libesd-oss.so.%{version}
-
-%if %{with alsa}
-%files alsa
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libesd-alsa.so.%{version}
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2006/04/21 16:02:55  freetz
+- alsa support by default, rel.5
+
 Revision 1.114  2006/04/20 17:33:59  paladine
 - fixed Ps and Rs, rel. 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/esound.spec?r1=1.114&r2=1.115&f=u