- fixed Ps and Rs, rel. 4

[packages/esound.git] / esound.spec

diff --git a/esound.spec b/esound.spec
index 2696054493f48e4d81b5b9b6cadbb2dd6f0197ab..2df2757c131acfd87e226cc6803ac03fae6b2c74 100644 (file)
--- a/esound.spec
+++ b/esound.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-%bcond_without alsa            # don't build ALSA version
-%bcond_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
@@ -11,27 +11,27 @@ Summary(pt_BR):     O servidor de som do Enlightenment
 Summary(ru):   óÅÒ×ÅÒ, ÐÏÚ×ÏÌÑÀÝÉÊ ÍÉËÛÉÒÏ×ÁÔØ ×Ù×ÏÄ ÎÁ Ú×ÕËÏ×ÏÅ ÕÓÔÒÏÊÓÔ×Ï
 Summary(uk):   óÅÒ×ÅÒ, ÝÏ ÄÏÚ×ÏÌѤ ͦËÛÉÒÕ×ÁÔÉ ×É×¦Ä ÎÁ Ú×ÕËÏ×ÉÊ ÐÒÉÓÔÒ¦Ê
 Name:          esound
-Version:       0.2.32
-Release:       3
+Version:       0.2.36
+Release:       4
 Epoch:         1
 License:       GPL
 Group:         Daemons
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
-# Source0-md5: b2a5e71ec8220fea1c22cc042f5f6e63
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/esound/0.2/%{name}-%{version}.tar.bz2
+# Source0-md5: 3facb5aa0115cc1c31771b9ad454ae76
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-etc_dir.patch
-Patch2:                %{name}-am18.patch
-%{?with_alsa:Patch3:   %{name}-alsa-pcm-newapi.patch }
+Patch2:                %{name}-auto_spawn.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
+%{?with_alsa:BuildRequires:    alsa-lib-devel >= 1.0.0}
+BuildRequires: audiofile-devel >= 1:0.2.0
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: docbook-dtd31-sgml
+BuildRequires: docbook-utils
 BuildRequires: libtool
 %{?with_libwrap:BuildRequires: libwrap-devel}
 BuildRequires: pkgconfig
-Requires:      esound-driver
-Provides:      libesd.so.0
+BuildRequires: rpmbuild(macros) >= 1.213
 Obsoletes:     libesound0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,6 +66,23 @@ EsounD (
 EsounD (ÄÅÍÏÎ, ÏÂÓÌÕÇÏ×ÕÀÞÉÊ Ú×ÕË, Ú ÐÒÏÅËÔÕ Enlightenment) ÍÏÖÅ
 ͦËÛÉÒÕ×ÁÔÉ Ë¦ÌØËÁ Ú×ÕËÏ×ÉÈ ÐÏÔÏË¦× × ÏÄÉÎ ÐÒÉÓÔÒ¦Ê × ÒÅÁÌØÎÏÍÕ ÞÁÓ¦.
 
+%package libs
+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
+
+%description libs
+EsounD libraries.
+
+%description libs -l pl
+Biblioteki EsounD.
+
 %package devel
 Summary:       Header files etc. to develop EsounD applications
 Summary(es):   Archivos de inclusión, etc para desarrollar aplicaciones EsounD
@@ -75,8 +92,8 @@ Summary(pt_BR):       Arquivos de inclus
 Summary(ru):   âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ esound
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÒÏÚÒÏÂËÉ ÄÌÑ esound
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
-%{?with_alsa:Requires: alsa-lib-devel}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+%{?with_alsa:Requires: alsa-lib-devel >= 1.0.0-pre1}
 Requires:      audiofile-devel
 Obsoletes:     libesound0-devel
 
@@ -115,7 +132,7 @@ Summary(pt_BR):     Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ esound
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÒÏÚÒÏÂËÉ ÄÌÑ esound
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description static
 EsounD static library.
@@ -145,9 +162,9 @@ Summary(pl):        Sterownik OSS dla EsoundD
 Group:         Libraries
 Requires(post):        /sbin/ldconfig
 Requires(post):        fileutils
-Requires:      %{name} = %{epoch}:%{version}
-Provides:      esound-driver
-Conflicts:     esound-alsa
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Provides:      %{name}-driver
+Obsoletes:     %{name}-alsa
 
 %description oss
 EsounD OSS driver.
@@ -161,9 +178,9 @@ Summary(pl):        Sterownik ALSA dla EsoundD
 Group:         Libraries
 Requires(post):        /sbin/ldconfig
 Requires(post):        fileutils
-Requires:      %{name} = %{epoch}:%{version}
-Provides:      esound-driver
-Conflicts:     esound-oss
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Provides:      %{name}-driver
+Obsoletes:     %{name}-oss
 
 %description alsa
 EsounD ALSA driver.
@@ -175,13 +192,11 @@ Sterownik ALSA dla EsoundD.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p0
+%patch2 -p0
 
 %build
-rm -f missing acinclude.m4
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 
@@ -189,7 +204,8 @@ rm -f missing acinclude.m4
 %configure \
        --enable-ipv6 \
        --with%{!?with_libwrap:out}-libwrap \
-       --enable-alsa
+       --enable-alsa \
+       --enable-local-sound
 %{__make}
 cp -f .libs/libesd.so.%{version} libesd-alsa.so.%{version}
 %{__make} clean
@@ -198,7 +214,8 @@ cp -f .libs/libesd.so.%{version} libesd-alsa.so.%{version}
 %configure \
        --enable-ipv6 \
        --with%{!?with_libwrap:out}-libwrap \
-       --disable-alsa
+       --disable-alsa \
+       --enable-local-sound
 %{__make}
 cp -f .libs/libesd.so.%{version} libesd-oss.so.%{version}
 
@@ -216,8 +233,8 @@ install libesd-*.so.*.* $RPM_BUILD_ROOT%{_libdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -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}
@@ -245,11 +262,14 @@ ln -fs libesd-alsa.so.%{version} %{_libdir}/libesd.so.%{version}
 %attr(755,root,root) %{_bindir}/esdplay
 %attr(755,root,root) %{_bindir}/esdrec
 %attr(755,root,root) %{_bindir}/esdsample
-%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 libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libesddsp.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libesd.so.%{version}
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/esd-config