X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=esound.spec;h=49bfbaaa8cdbc0830801b53e25ead35bb960dfa7;hb=f18ce2e6a544638e9098fdf486f34ae894bbb6fc;hp=fc949c46fb748404a824460f5be820334468c1ac;hpb=cf50a68c4db06dacde53f4fa001fb40b6113318e;p=packages%2Fesound.git

diff --git a/esound.spec b/esound.spec
index fc949c4..49bfbaa 100644
--- a/esound.spec
+++ b/esound.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-# _without_libwrap	- without hosts.{access,deny} support
+%bcond_without alsa 		# don't build ALSA version
+%bcond_without libwrap 		# without hosts.{access,deny} support
 #
 Summary:	The Enlightened Sound Daemon
 Summary(es):	El servidor de sonido del Enlightenment
@@ -10,26 +11,31 @@ Summary(pt_BR):	O servidor de som do Enlightenment
 Summary(ru):	óÅÒ×ÅÒ, ÐÏÚ×ÏÌÑÀÝÉÊ ÍÉËÛÉÒÏ×ÁÔØ ×Ù×ÏÄ ÎÁ Ú×ÕËÏ×ÏÅ ÕÓÔÒÏÊÓÔ×Ï
 Summary(uk):	óÅÒ×ÅÒ, ÝÏ ÄÏÚ×ÏÌѤ ͦËÛÉÒÕ×ÁÔÉ ×É×¦Ä ÎÁ Ú×ÕËÏ×ÉÊ ÐÒÉÓÔÒ¦Ê
 Name:		esound
-Version:	0.2.29
-Release:	2
+Version:	0.2.32
+Release:	4
 Epoch:		1
 License:	GPL
 Group:		Daemons
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/esound/0.2/%{name}-%{version}.tar.gz
-# Source0-md5: 657c998c1a6a6648811de447abcfdab0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
+# Source0-md5:	b2a5e71ec8220fea1c22cc042f5f6e63
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-etc_dir.patch
+Patch2:		%{name}-am18.patch
+Patch3:		%{name}-alsa-pcm-newapi.patch
 URL:		http://www.tux.org/~ricdude/EsounD.html
+%{?with_alsa:BuildRequires:	alsa-lib-devel >= 1.0.0-pre1 }
 BuildRequires:	audiofile-devel >= 0.2.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+%{?with_libwrap:BuildRequires:	libwrap-devel}
 BuildRequires:	pkgconfig
-%{!?_without_libwrap:BuildRequires:	libwrap-devel}
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	esound-driver
+Provides:	libesd.so.0
 Obsoletes:	libesound0
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc
+%define		_noautoprov	libesd.so.0
 
 %description
 The Enlightened Sound Daemon is a server process that allows multiple
@@ -61,37 +67,37 @@ EsounD (
 ͦËÛÉÒÕ×ÁÔÉ Ë¦ÌØËÁ Ú×ÕËÏ×ÉÈ ÐÏÔÏË¦× × ÏÄÉÎ ÐÒÉÓÔÒ¦Ê × ÒÅÁÌØÎÏÍÕ ÞÁÓ¦.
 
 %package devel
-Summary:	Libraries, includes, etc to develop EsounD applications
-Summary(es):	Bibliotecas, archivos de inclusión, etc para desarrollar aplicaciones EsounD
-Summary(fr):	Bibliothèques, includes, etc pour programmer pour EsounD
-Summary(pl):	Biblioteki, pliki nag³ówkowe oraz dokumentacja
-Summary(pt_BR):	Bibliotecas, arquivos de inclusão, etc para desenvolver aplicações EsounD
+Summary:	Header files etc. to develop EsounD applications
+Summary(es):	Archivos de inclusión, etc para desarrollar aplicaciones EsounD
+Summary(fr):	Includes, etc pour programmer pour EsounD
+Summary(pl):	Pliki nag³ówkowe i inne do tworzenia aplikacji z u¿yciem EsounD
+Summary(pt_BR):	Arquivos de inclusão, etc para desenvolver aplicações EsounD
 Summary(ru):	âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ esound
 Summary(uk):	â¦Â̦ÏÔÅËÉ ÒÏÚÒÏÂËÉ ÄÌÑ esound
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}
+%{?with_alsa:Requires:	alsa-lib-devel}
 Requires:	audiofile-devel
 Obsoletes:	libesound0-devel
 
 %description devel
-Libraries, include files, etc you can use to develop EsounD
-applications.
+Header files, etc you can use to develop EsounD applications.
 
 %description devel -l es
-Bibliotecas, archivos de inclusión, etc, para que puedas desarrollar
-aplicaciones que usen el servidor de sonido EsounD.
+Archivos de inclusión, etc, para que puedas desarrollar aplicaciones
+que usen el servidor de sonido EsounD.
 
 %description devel -l fr
-Bibliothèques, fichiers d'en-têtes, etc. necessaires pour écrire des
-applications avec support EsounD
+Fichiers d'en-têtes, etc. necessaires pour écrire des applications
+avec support EsounD.
 
 %description devel -l pl
-Biblioteki, pliki nag³ówkowe oraz dokumentacja - czyli wszystko czego
-potrzebujesz do tworzenia aplikacji pod EsounD.
+Pliki nag³ówkowe i inne potrzebne do tworzenia aplikacji
+korzystaj±cych z systemu EsounD.
 
 %description devel -l pt_BR
-Bibliotecas, arquivos de inclusão, etc, para que você possa
-desenvolver aplicações que usem o servidor de som EsounD.
+Arquivos de inclusão, etc, para que você possa desenvolver aplicações
+que usem o servidor de som EsounD.
 
 %description devel -l ru
 üÔÏÔ ÐÁËÅÔ ×ËÌÀÞÁÅÔ ÆÁÊÌÙ ÈÅÄÅÒÏ× É ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ
@@ -109,7 +115,7 @@ Summary(pt_BR):	Bibliotecas est
 Summary(ru):	óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ esound
 Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÒÏÚÒÏÂËÉ ÄÌÑ esound
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}
 
 %description static
 EsounD static library.
@@ -133,21 +139,69 @@ usem o servidor de som EsounD.
 ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ
 ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ esound.
 
+%package oss
+Summary:	EsounD OSS driver
+Summary(pl):	Sterownik OSS dla EsoundD
+Group:		Libraries
+Requires(post):	/sbin/ldconfig
+Requires(post):	fileutils
+Requires:	%{name} = %{epoch}:%{version}
+Obsoletes:	%{name}-alsa
+Provides:	%{name}-driver
+
+%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} = %{epoch}:%{version}
+Obsoletes:	%{name}-oss
+Provides:	%{name}-driver
+
+
+%description alsa
+EsounD ALSA driver.
+
+%description alsa -l pl
+Sterownik ALSA dla EsoundD.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p0
 
 %build
 rm -f missing acinclude.m4
 %{__libtoolize}
-%{__aclocal} || ( echo 'AC_DEFUN([AM_PATH_ALSA],[])' > acinclude.m4 && aclocal )
+%{__aclocal}
 %{__autoconf}
 %{__automake}
+
+%if %{with alsa}
 %configure \
-	--with%{?_without_libwrap:out}-libwrap
+	--enable-ipv6 \
+	--with%{!?with_libwrap:out}-libwrap \
+	--enable-alsa
+%{__make}
+cp -f .libs/libesd.so.%{version} libesd-alsa.so.%{version}
+%{__make} clean
+%endif
 
+%configure \
+	--enable-ipv6 \
+	--with%{!?with_libwrap:out}-libwrap \
+	--disable-alsa
 %{__make}
+cp -f .libs/libesd.so.%{version} libesd-oss.so.%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -157,16 +211,30 @@ rm -rf $RPM_BUILD_ROOT
 	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   -p /sbin/ldconfig
 %postun -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 README
-
+%doc AUTHORS ChangeLog NEWS README TIPS TODO docs/html
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/esd.conf
 %attr(755,root,root) %{_bindir}/esd
 %attr(755,root,root) %{_bindir}/esdcat
@@ -178,13 +246,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/esdplay
 %attr(755,root,root) %{_bindir}/esdrec
 %attr(755,root,root) %{_bindir}/esdsample
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libesddsp.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libesd.so.%{version}
 %{_mandir}/man1/esd.1*
 %{_mandir}/man1/esd[a-z]*.1*
 
 %files devel
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/esd-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
@@ -196,3 +264,13 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %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