* Mon Apr 07 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.11.1-2

- pulse-rework2 patch (#439731)
- -pulseaudio subpkg (#439731)

xine-lib.spec

@@ -32,7 +32,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -48,6 +48,10 @@ Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstream patches
+# lennart said this was upstreamed already.  :)
+Patch100: http://0pointer.de/public/xine-pulse-rework2.patch
+
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
 BuildRequires:  libX11-devel
@@ -119,6 +123,7 @@ Requires:       zlib-devel
 %description    devel
 This package contains development files for xine-lib.
 
+# TODO: consider removing and/or marking as deprecated for F9+ -- Rex
 %package        arts
 Summary:        aRts plugin for xine-lib
 Group:          System Environment/Libraries
@@ -129,6 +134,16 @@ Obsoletes:      xine-lib-extras < 1.1.7-3
 %description    arts
 This package contains the aRts extra plugin for xine-lib.
 
+%package        pulseaudio
+Summary:        Pulseaudio plugin for xine-lib
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+# -pulseaudio was split off -extras at 1.1.11.1-2
+#Obsoletes:     xine-lib-extras < 1.1.11.1-2
+
+%description    pulseaudio
+This package contains the pulseaudio plugin for xine-lib.
+
 %package        extras
 Summary:        Additional plugins for xine-lib
 Group:          System Environment/Libraries
@@ -138,9 +153,6 @@ Requires:       %{name} = %{version}-%{release}
 This package contains extra plugins for xine-lib:
   - EsounD
   - JACK
-%if %{with_pa}
-  - Pulseaudio
-%endif # pa
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
@@ -169,6 +181,8 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
+%patch100 -p1 -b .pulse-rework2
+
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -348,13 +362,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
 
+%if %{with_pa}
+%files pulseaudio
+%defattr(-,root,root,-)
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%endif 
+
 %files extras
 %defattr(-,root,root,-)
 %{_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/%{abiver}/xineplug_decode_image.so
@@ -386,6 +403,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 07 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.11.1-2
+- pulse-rework2 patch (#439731)
+- -pulseaudio subpkg (#439731)
+
 * 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