- changed without_alsa to _with_alsa (alsa suppert is broken)

- removced stubs patch, it was fault of old libtool
- added libtool >= 1.4.2 requirement
- added enabling/diabling alsa compilation ccording to cond
- release 2

Changed files:
    xine-lib.spec -> 1.17

diff --git a/xine-lib.spec b/xine-lib.spec
index 57d457ba03de8f68fe273aa62aa1f63ac644bd33..3b58fba8f71130a004a548c0e33ba8988bdb54f8 100644 (file)
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,6 +1,6 @@
 # Conditional build:
 # --without    aa
-# --with       alsa
+# --with       alsa    (alsa support is currently broken)
 # --without    arts
 # --without    esd
 # --without    oss
@@ -11,7 +11,7 @@ Summary(pl):  Odtwarzacz video
 Summary(ko):   °ø°³ µ¿¿µ»ó Ç÷¹À̾î
 Name:          xine-lib
 Version:       0.9.1
-Release:       1
+Release:       2
 License:       GPL
 Group:         Libraries
 Group(de):     Libraries
@@ -19,8 +19,7 @@ Group(es):    Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
 Source0:       http://xine.sourceforge.net/files/%{name}-%{version}.tar.gz
-Patch0:                %{name}-stubs.patch
-Patch1:                %{name}-am15.patch
+Patch0:                %{name}-am15.patch
 URL:           http://xine.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.5
@@ -33,7 +32,7 @@ BuildRequires:        automake >= 1.5
 %{!?_without_alsa:BuildRequires:       alsa-lib-devel}
 %endif
 %{!?_without_esd:BuildRequires:                esound-devel}
-BuildRequires: libtool
+BuildRequires: libtool >= 1.4.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     xine
 
@@ -235,7 +234,6 @@ HTML documentation of XINE API and development components.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 rm -f missing
@@ -245,7 +243,9 @@ autoconf
 automake -a -c
 autoheader
 %configure \
-       --with-aalib-prefix=/usr
+       --with-aalib-prefix=/usr \
+%{?_with_alsa: --enable-alsa} \
+%{!?_with_alsa:        --disable-alsa}
        
 %{__make}
 
@@ -299,7 +299,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pluginsdir}/*oss.so
 %endif
 
-%if %{!?_without_alsa:1}
+%if %{?_with_alsa:1}
 %ifnarch sparc sparc64
 %files alsa
 %defattr(644,root,root,755)
@@ -321,7 +321,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_pluginsdir}/*esd.so
 %endif
 
-%if %{!?_with_dxr3:0}
+%if %{?_with_dxr3:1}
 %files dxr3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xine/plugins/xineplug_decode_dxr3.so