[rpms/xine-lib] epel9-next: * Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2

            A new commit has been pushed.

            Repo   : rpms/xine-lib
            Branch : epel9-next
            Commit : fd15e85a16c6bc3d27b04b6c3fcbdb2bf50dd1dc
            Author : Ville Skyttä <scop@fedoraproject.org>
            Date   : 2008-01-26T23:31:13+00:00
            Stats  : +11/-7 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/xine-lib/c/fd15e85a16c6bc3d27b04b6c3fcbdb2bf50dd1dc?branch=epel9-next

            Log:
            * Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
- Include spu, spucc, and spucmml decoders (#213597).

---
diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh
index dddb8d6..5710edf 100755
--- a/xine-lib-cleanup-sources.sh
+++ b/xine-lib-cleanup-sources.sh
@@ -22,14 +22,14 @@ tar -xjf $tarball
 cd $dir
 
 # Main libraries
-for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libspucmml libspucc liba52 libdts; do
+for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do
     echo "removing src/$remove..."
     rm -rf src/$remove 
     sed -i -e "/$remove/d" src/Makefile.am
     sed -i -e "/^src\/$remove/d" configure.ac
 done
 # Input plugin libraries
-for remove in libdvdnav vcd; do
+for remove in vcd; do
     echo "removing src/input/$remove..."
     rm -rf src/input/$remove 
     sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am

diff --git a/xine-lib.spec b/xine-lib.spec
index 21601d6..6992539 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -6,6 +6,7 @@
 #   http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
 #   --> not yet:
 #    http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
+# - external dvdnav - not compatible as of 1.1.9.1 and 4.1.1
 
 %define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
@@ -33,7 +34,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -87,9 +88,7 @@ BuildRequires:  jack-audio-connection-kit-devel
 # CDs
 BuildRequires:  libcdio-devel
 # Other
-BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
-# samba-common in <= FC-6, libsmbclient-devel in FC7+
-BuildRequires:  %{_includedir}/libsmbclient.h
+BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel libsmbclient-devel
 
 %package devel
 Summary:         Xine library development files
@@ -180,7 +179,6 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 %endif # directfb
     --disable-a52dec \
     --disable-mad \
-    --disable-dvdnavtest --with-external-dvdnav \
     --disable-vcd \
     --disable-asf \
     --disable-faad \
@@ -283,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/%{version}/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/%{version}/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/%{version}/xineplug_decode_spucmml.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
@@ -384,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
+- Include spu, spucc, and spucmml decoders (#213597).
+
 * Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
 - 1.1.10 (security update).