rpms/xine-lib/devel xine-lib-cleanup-sources.sh, 1.5, 1.6 xine-lib.spec, 1.32, 1.33

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29037

Modified Files:
	xine-lib-cleanup-sources.sh xine-lib.spec 
Log Message:
* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
- Include spu, spucc, and spucmml decoders (#213597).



Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib-cleanup-sources.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xine-lib-cleanup-sources.sh	6 Jan 2008 21:51:14 -0000	1.5
+++ xine-lib-cleanup-sources.sh	26 Jan 2008 23:31:13 -0000	1.6
@@ -22,14 +22,14 @@
 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


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xine-lib.spec	26 Jan 2008 23:27:32 -0000	1.32
+++ xine-lib.spec	26 Jan 2008 23:31:13 -0000	1.33
@@ -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 @@
 # 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 @@
 %endif # directfb
     --disable-a52dec \
     --disable-mad \
-    --disable-dvdnavtest --with-external-dvdnav \
     --disable-vcd \
     --disable-asf \
     --disable-faad \
@@ -283,6 +281,9 @@
 %{_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 @@
 
 
 %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).