- merged from HEAD (before alsa incorporation)

Changed files:
    esound.spec -> 1.111.2.1

diff --git a/esound.spec b/esound.spec
index 48a1e69bb67e3e5e30fdfc47e3279476037a2774..2df2757c131acfd87e226cc6803ac03fae6b2c74 100644 (file)
--- a/esound.spec
+++ b/esound.spec
@@ -12,7 +12,7 @@ Summary(ru):  
 Summary(uk):   óÅÒ×ÅÒ, ÝÏ ÄÏÚ×ÏÌѤ ͦËÛÉÒÕ×ÁÔÉ ×É×¦Ä ÎÁ Ú×ÕËÏ×ÉÊ ÐÒÉÓÔÒ¦Ê
 Name:          esound
 Version:       0.2.36
-Release:       2
+Release:       4
 Epoch:         1
 License:       GPL
 Group:         Daemons
@@ -26,16 +26,12 @@ URL:                http://www.tux.org/~ricdude/EsounD.html
 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
 BuildRequires: rpmbuild(macros) >= 1.213
-Requires:      esound-driver
-%ifarch %{x8664} ia64 ppc64 s390x sparc64
-Provides:      libesd.so.0()(64bit)
-%else
-Provides:      libesd.so.0
-%endif
 Obsoletes:     libesound0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,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
@@ -79,7 +92,7 @@ Summary(pt_BR):       Arquivos de inclus
 Summary(ru):   âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ esound
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÒÏÚÒÏÂËÉ ÄÌÑ esound
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 %{?with_alsa:Requires: alsa-lib-devel >= 1.0.0-pre1}
 Requires:      audiofile-devel
 Obsoletes:     libesound0-devel
@@ -149,7 +162,7 @@ Summary(pl):        Sterownik OSS dla EsoundD
 Group:         Libraries
 Requires(post):        /sbin/ldconfig
 Requires(post):        fileutils
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:      %{name}-driver
 Obsoletes:     %{name}-alsa
 
@@ -165,7 +178,7 @@ Summary(pl):        Sterownik ALSA dla EsoundD
 Group:         Libraries
 Requires(post):        /sbin/ldconfig
 Requires(post):        fileutils
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:      %{name}-driver
 Obsoletes:     %{name}-oss
 
@@ -220,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}
@@ -249,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