dist-git conversion

- CVE-2008-1878 (#443054)

.cvsignore

@@ -1,2 +0,0 @@
-xine-lib-1.1.6-pruned.tar.bz2
-xine-lib-1.1.6-autotools.patch.bz2

.gitignore

@@ -0,0 +1,2 @@
+xine-lib-1.1.11.1-pruned.tar.bz2
+xine-lib-1.1.11.1-autotools.patch.bz2

Makefile

@@ -4,7 +4,7 @@ NAME := xine-lib
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -0,0 +1 @@
+F-7

sources

@@ -1,2 +1,2 @@
-3869f0045311b3638c5724cd1ac122e9  xine-lib-1.1.6-pruned.tar.bz2
-25742f2347a1d9c4c08476c82f3ec5fc  xine-lib-1.1.6-autotools.patch.bz2
+b6a4fe9dd2ec80452870a8bfbb3974f0  xine-lib-1.1.11.1-pruned.tar.bz2
+c257bf0b964d25592f1c612149ae2c7a  xine-lib-1.1.11.1-autotools.patch.bz2

xine-lib-1.1.11.1-mkv.patch

@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Darren Salt <linux@youmustbejoking.demon.co.uk>
+# Date 1207353205 -3600
+# Node ID ff20b8db74eabc74b7b95da4c1b44fc5d7f2ec8c
+# Parent 05ebc886fd30158b59a26e03cf2f6f3a52114b24
+Fix a regression in the Matroska demuxer.
+One '&'...
+
+--- a/src/demuxers/ebml.c	Fri Apr 04 18:35:33 2008 +0100
++++ b/src/demuxers/ebml.c	Sat Apr 05 00:53:25 2008 +0100
+@@ -327,7 +327,7 @@ char *ebml_alloc_read_ascii (ebml_parser
+   if (text)
+   {
+     text[elem->len] = '\0';
+-    if (ebml_read_ascii (ebml, &elem, text))
++    if (ebml_read_ascii (ebml, elem, text))
+       return text;
+     free (text);
+   }
+

xine-lib-1.1.11.1-qt.patch

@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User Darren Salt <linux@youmustbejoking.demon.co.uk>
+# Date 1206976103 -3600
+# Node ID d8e1305c13820b82d896f7bc77d196b9c9645dd6
+# Parent 2cc583bdc498fd6c95b8a21c10e81a0cef4d63c6
+Revert a change which broke Quicktime atom parsing.
+
+--- a/src/demuxers/demux_qt.c	Sun Mar 30 19:48:58 2008 +0100
++++ b/src/demuxers/demux_qt.c	Mon Mar 31 16:08:23 2008 +0100
+@@ -895,11 +895,6 @@ static qt_error parse_trak_atom (qt_trak
+   for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) {
+     current_atom_size = _X_BE_32(&trak_atom[i - 4]);	
+     current_atom = _X_BE_32(&trak_atom[i]);
+-
+-    if (current_atom_size > trak_atom_size - i) {
+-      last_error = QT_NOT_A_VALID_FILE;
+-      goto free_trak;
+-    }
+ 
+     if (current_atom == TKHD_ATOM) {
+       trak->flags = _X_BE_16(&trak_atom[i + 6]);
+

xine-lib-1.1.12-CVE-2008-1878.patch

@@ -0,0 +1,16 @@
+diff -up xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878 xine-lib-1.1.12/src/demuxers/demux_nsf.c
+--- xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878	2008-03-28 09:24:50.000000000 -0500
++++ xine-lib-1.1.12/src/demuxers/demux_nsf.c	2008-04-24 06:52:45.000000000 -0500
+@@ -106,9 +106,9 @@ static int open_nsf_file(demux_nsf_t *th
+ 
+   this->total_songs = header[6];
+   this->current_song = header[7];
+-  this->title = strdup(&header[0x0E]);
+-  this->artist = strdup(&header[0x2E]);
+-  this->copyright = strdup(&header[0x4E]);
++  this->title = strndup((char*)&header[0x0E], 0x20);
++  this->artist = strndup((char*)&header[0x2E], 0x20);
++  this->copyright = strndup((char*)&header[0x4E], 0x20); 
+ 
+   this->filesize = this->input->get_length(this->input);
+ 

xine-lib-1.1.5-multilib-devel.patch

@@ -1,40 +0,0 @@
---- misc/xine-config.in~	2007-04-05 01:18:00.000000000 +0300
-+++ misc/xine-config.in	2007-04-11 01:32:44.000000000 +0300
-@@ -2,8 +2,8 @@
- #
- #
- 
--prefix=@XINE_CONFIG_PREFIX@
--exec_prefix=@exec_prefix@
-+prefix=$(pkg-config libxine --variable=prefix)
-+exec_prefix=$(pkg-config libxine --variable=exec_prefix)
- exec_prefix_set=no
- 
- usage()
-@@ -54,7 +54,7 @@
-       echo_exec_prefix=yes
-       ;;
-     --version)
--      echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@
-+      pkg-config libxine --modversion
-       ;;
-     --acflags)
-       echo_acflags=yes
-@@ -100,14 +100,14 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I@includedir@ @PTHREAD_CFLAGS@
-+      pkg-config libxine --cflags
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
-+      pkg-config libxine --libs
- fi      
- if test "$echo_plugindir" = "yes"; then
--      echo "@XINE_PLUGINPATH@"
-+      echo "$(pkg-config libxine --variable=libdir)/xine/plugins/$(pkg-config libxine --modversion)"
- fi      
- if test "$echo_datadir" = "yes"; then
-       echo "@XINE_DATADIR@"

xine-lib-cleanup-sources.sh

@@ -21,19 +21,27 @@ rm -rf $dir
 tar -xjf $tarball
 cd $dir
 
+rmpluglib()
+{
+    echo "removing src/$1/$2..."
+    rm -rf src/$1/$2
+    sed -i -e "s/SUBDIRS = \(.*\)$2\(.*\)/SUBDIRS = \1\2/g" src/$1/Makefile.am
+    sed -i -e "/^src\/$1\/$2/d" configure.ac
+}
+
 # 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
-    echo "removing src/input/$remove..."
-    rm -rf src/input/$remove 
-    sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am
-    sed -i -e "/^src\/input\/$remove/d" configure.ac
+for remove in vcd; do
+    rmpluglib input vcd
+done
+for remove in ffmpeg; do
+    rmpluglib combined ffmpeg
 done
 # Input plugins
 for p in dvd vcd mms; do
@@ -66,7 +74,7 @@ sed -i -e '/^xineplug_decode_nsf_la/,/^\s*$/d' \
        -e /xineplug_decode_nsf/d \
        -e 's/ nosefart//' \
        src/libxineadec/Makefile.am
-sed -i -e /nosefart/d configure.ac
+sed -i -e '/nosefart\/Makefile/d' configure.ac
 
 # All clean !
 

xine-lib.spec

@@ -1,24 +1,44 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
-# - xcb stuff when it's available
+# - drop the opengl video out plugin?
+#   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
+# - move pulseaudio to main package from -extras?
+#   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.11 and 4.1.1
+
+%define         abiver      1.20
+%define         codecdir    %{_libdir}/codecs
 
-%define         codecdir %{_libdir}/codecs
 %ifarch %{ix86}
-%define         have_vidix 1
+    %define     have_vidix  1
 %else
-%define         have_vidix 0
-%endif
+    %define     have_vidix  0
+%endif # ix86
+
+%if 0%{?fedora}
+    %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
+    %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
+    %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+    %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
+%else
+    %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
+    %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
+    %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+    %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
+%endif # Fedora
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.6
-Release:        2%{?dist}
-License:        GPL
+Version:        1.1.11.1
+Release:        1%{?dist}.2
+License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 # The tarball is generated from the upstream tarball using
 # the script in SOURCE1. It prunes potentially patented code
-#Source0:        http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
 Source0:        %{name}-%{version}-pruned.tar.bz2
 Source1:        %{name}-cleanup-sources.sh
 Source2:        %{name}-mk-autotools-patch.sh
@@ -26,80 +46,122 @@ Source2:        %{name}-mk-autotools-patch.sh
 Patch0:         %{name}-%{version}-autotools.patch.bz2
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
-Patch7:         %{name}-1.1.5-multilib-devel.patch
+Patch7:         %{name}-1.1.12-CVE-2008-1878.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# upstream patches
+Patch101:       %{name}-1.1.11.1-mkv.patch
+Patch102:       %{name}-1.1.11.1-qt.patch
+
+Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
-BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXv-devel
+BuildRequires:  libXinerama-devel
+BuildRequires:  libXvMC-devel
+BuildRequires:  libGLU-devel
+%if %{with_xcb}
+BuildRequires:  libxcb-devel
+%endif # xcb
 # Video
-BuildRequires:  SDL-devel libtheora-devel libmng-devel
+BuildRequires:  SDL-devel
+BuildRequires:  libtheora-devel
+BuildRequires:  libmng-devel
+%if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
+%endif # aalib
+%if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
+%endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
-%endif
+%endif # directfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
-%endif
+%endif # imagemagick
 %if 0%{?_with_freetype:1}
 BuildRequires:  fontconfig-devel
-%endif
+%endif # freetype
 # Audio
-BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
-BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  flac-devel
+BuildRequires:  libmodplug-devel
+BuildRequires:  esound-devel
+BuildRequires:  speex-devel
+BuildRequires:  arts-devel
+BuildRequires:  alsa-lib-devel >= 0.9.0
+BuildRequires:  libmpcdec-devel
+BuildRequires:  wavpack-devel
+%if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
+%endif # pa
+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
-
-%package devel
-Summary:         Xine library development files
-Group:           Development/Libraries
-Requires:        %{name} = %{version}-%{release}
-Requires:        pkgconfig zlib-devel
-
-%package extras
-Summary:         Additional plugins for xine-lib
-Group:           System Environment/Libraries
-Requires:        %{name} = %{version}-%{release}
-
+BuildRequires:  pkgconfig
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libsmbclient-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
 It can play back various media. It also decodes multimedia files from local
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
-of the most uncommon formats, too.  Non-default rpmbuild options:
---without imagemagick:  Disable ImageMagick support
---without directfb:     Disable DirectFB support
---with    freetype:     Enable FreeType/Fontconfig support
---with    antialiasing: Enable font antialiasing (with FreeType/FontConfig)
+of the most uncommon formats, too.  --with/--without rpmbuild options
+(some default values depend on target distribution): aalib, caca, directfb,
+imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
 
-%description devel
+%package        devel
+Summary:        Xine library development files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       zlib-devel
+
+%description    devel
 This package contains development files for xine-lib.
 
-%description extras
+%package        arts
+Summary:        aRts plugin for xine-lib
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+# -arts was split off the -extras subpackage at 1.1.7-3
+Obsoletes:      xine-lib-extras < 1.1.7-3
+
+%description    arts
+This package contains the aRts extra plugin for xine-lib.
+
+%package        extras
+Summary:        Additional plugins for xine-lib
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    extras
 This package contains extra plugins for xine-lib:
-  - aRts
   - EsounD
   - JACK
+%if %{with_pa}
   - Pulseaudio
+%endif # pa
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
   - SDL
+%if %{with_aalib}
   - AA-lib
+%endif # aalib
+%if %{with_caca}
   - Libcaca
+%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
-%endif
+%endif # imagemagick
 %if 0%{!?_without_directfb:1}
   - DirectFB output
-%endif
-
+%endif # directfb
 
 
 %prep
@@ -111,7 +173,10 @@ touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
-%patch7 -p0 -b .multilib-devel
+%patch7 -p1 -b .CVE-2008-1878
+
+%patch101 -p1 -b .mkv
+%patch102 -p1 -b .qt
 
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -121,35 +186,36 @@ sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
-%configure --disable-dependency-tracking \
-    --with-xv-path=%{_libdir} \
-    --with-w32-path=%{codecdir} \
-    --with-real-codecs-path=%{codecdir} \
-    --with-external-ffmpeg \
-    --with-external-libmpcdec \
-    --with-libflac \
-    --with-wavpack \
+# Keep list of options in mostly the same order as ./configure --help.
+%configure \
+    --disable-dependency-tracking \
     --enable-ipv6 \
 %if 0%{!?_without_directfb:1}
     --enable-directfb \
-%endif
-%if 0%{?_without_imagemagick:1}
-    --without-imagemagick \
-%endif
+%endif # directfb
+    --disable-a52dec \
+    --disable-mad \
+    --disable-vcd \
+    --disable-asf \
+    --disable-faad \
 %if 0%{?_with_freetype:1}
-    --with-freetype \
-    --with-fontconfig \
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
-%endif
-%endif
-    --disable-libfame \
-    --disable-faad \
-    --disable-mad \
-    --disable-asf \
-    --disable-vcd \
-    --disable-a52dec \
-    --with-external-dvdnav --disable-dvdnavtest
+%endif # antialiasing
+    --with-freetype \
+    --with-fontconfig \
+%endif # freetype
+    --with-external-ffmpeg \
+    --with-xv-path=%{_libdir} \
+    --with-libflac \
+    --with-external-libmpcdec \
+%if 0%{?_without_imagemagick:1}
+    --without-imagemagick \
+%endif # imagemagick
+    --with-arts \
+    --with-wavpack \
+    --with-real-codecs-path=%{codecdir} \
+    --with-w32-path=%{codecdir}
 
 make %{?_smp_mflags}
 
@@ -189,118 +255,132 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/xine.5*
 %dir %{_libdir}/xine/
 %dir %{_libdir}/xine/plugins/
-%dir %{_libdir}/xine/plugins/%{version}/
-%{_libdir}/xine/plugins/%{version}/mime.types
+%dir %{_libdir}/xine/plugins/%{abiver}/
+%{_libdir}/xine/plugins/%{abiver}/mime.types
 # Listing every plugin separately for better control over binary packages
 # containing exactly the plugins we want, nothing accidentally snuck in
 # nor dropped.
-%dir %{_libdir}/xine/plugins/%{version}/post/
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_audio_filters.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_goom.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_mosaico.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_switch.so
-%{_libdir}/xine/plugins/%{version}/post/xineplug_post_visualizations.so
+%dir %{_libdir}/xine/plugins/%{abiver}/post/
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so
+%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so
 %if %{have_vidix}
-%dir %{_libdir}/xine/plugins/%{version}/vidix/
-%{_libdir}/xine/plugins/%{version}/vidix/cyberblade_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mach64_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mga_crtc2_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/mga_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/nvidia_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/pm2_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/pm3_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/radeon_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/rage128_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
-%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
-%endif
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_gsm610.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
+%dir %{_libdir}/xine/plugins/%{abiver}/vidix/
+%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so
+%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so
+%endif # vidix
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
-%endif
-%{_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_spudvb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so
+%endif # ix86
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so
 %ifarch %ix86
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
-%endif
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so
-%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so
-%{_libdir}/xine/plugins/%{version}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so
+%endif # ix86
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
-%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
+%endif # vidix
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so
+%endif # xcb
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so
 
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
 
 %files extras
 %defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
-%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so
+%if %{with_pa}
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%endif # pa
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so
 %if 0%{!?_without_imagemagick:1}
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
-%endif
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
-%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so
+%endif # imagemagick
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so
+%if %{with_aalib}
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
+%endif # aalib
+%if %{with_caca}
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
+%endif # caca
 %if 0%{!?_without_directfb:1}
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
-
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
+%endif # directfb
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -315,6 +395,84 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 24 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.11.1-1.2
+- CVE-2008-1878 (#443054)
+
+* Wed Apr  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1.1
+- Apply upstream fixes for Quicktime (#441705) and Matroska regressions
+  introduced in 1.1.11.1.
+
+* Sun Mar 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1
+- 1.1.11.1 (security update, #438663, CVE-2008-1482).
+- Provide versioned xine-lib(plugin-abi) so 3rd party packages installing
+  plugins can use it instead of requiring a version of xine-lib.
+
+* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11-1
+- 1.1.11 (security update, #438182, CVE-2008-0073).
+- Drop jack and wavpack build conditionals.
+- Specfile cleanups.
+
+* Fri Mar  7 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.10.1-1.1
+- xcb support for f7+ (#373411)
+
+* Fri Feb  8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1
+- 1.1.10.1 (security update, #431541).
+
+* 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).
+
+* Mon Jan 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-3
+- Fix version number in libxine.pc (#429487).
+
+* Sun Jan 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-2
+- Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182).
+
+* Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-1
+- 1.1.9.1 (security update).
+
+* Sun Jan  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-1
+- 1.1.9.
+
+* Thu Sep 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-6
+- Enable wavpack support by default for all distros.
+
+* Sun Sep 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-5
+- Enable JACK support by default for all distros.
+
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-4
+- Fix "--without wavpack" build.
+
+* Sat Sep 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-3
+- Move XCB plugins to the main package.
+- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
+  time in preparation for the first EPEL build.
+
+* Sun Sep 09 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.1.8-2
+- remove the dependency from -extras to -arts, and use Obsoletes to
+  provide an upgrade path
+
+* Thu Aug 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-1
+- 1.1.8, "open" patch applied upstream.
+- Build XCB plugins by default for Fedora 8+ only.
+
+* Sat Aug 25 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.1.7-3
+- Split the aRts plugin into its own subpackage
+
+* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2
+- Include XCB output plugins (in -extras at least for now).
+- Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
+- Clean up %%configure options.
+- License: GPLv2+
+
+* Thu Jun  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-1
+- 1.1.7.
+
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.1.6-3
+- respin (for libmpcdec)
+
 * Wed Apr 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-2
 - Make Real codec search path /usr/lib(64)/codecs again (#237743).