rpms/xine-lib/devel xine-lib.spec,1.45,1.46

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25101

Modified Files:
	xine-lib.spec 
Log Message:
restore -pulseaudio subpkg
upsream -ansi-related patch
cleanup BR's a bit (more)



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xine-lib.spec	15 Aug 2008 19:38:41 -0000	1.45
+++ xine-lib.spec	22 Aug 2008 15:12:26 -0000	1.46
@@ -45,9 +45,13 @@
 Source2:        %{name}-mk-autotools-patch.sh
 # autotools patch created with source2
 Patch0:         %{name}-%{version}-autotools.patch.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 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
+# phonon-xine doesn't compile with xine-lib-1.1.15, http://bugs.kde.org/169365
+Patch100:       xine-lib-1.1.15-ansi.patch
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
@@ -79,26 +83,25 @@
 BuildRequires:  fontconfig-devel
 %endif # freetype
 # Audio
-BuildRequires:  libogg-devel
-BuildRequires:  libvorbis-devel
+BuildRequires:  alsa-lib-devel >= 0.9.0
+BuildRequires:  esound-devel
 BuildRequires:  flac-devel
+BuildRequires:  jack-audio-connection-kit-devel
 BuildRequires:  libmodplug-devel
-BuildRequires:  esound-devel
-BuildRequires:  speex-devel
-%if 0%{?_without_arts:1}
-Obsoletes: %{name}-arts < %{version}-%{release}
-%else
-BuildRequires: arts-devel
-%endif
-BuildRequires:  alsa-lib-devel >= 0.9.0
 BuildRequires:  libmpcdec-devel
-BuildRequires:  wavpack-devel
+BuildRequires:  libvorbis-devel
 %if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
 Obsoletes: %{name}-pulseaudio < %{version}-%{release}
 Provides:  %{name}-pulseaudio = %{version}-%{release}
 %endif # pa
-BuildRequires:  jack-audio-connection-kit-devel
+BuildRequires:  speex-devel
+%if 0%{?_without_arts:1}
+Obsoletes:      xine-lib-arts < %{version}-%{release}
+%else
+BuildRequires:  arts-devel
+%endif
+BuildRequires:  wavpack-devel
 # CDs
 BuildRequires:  libcdio-devel
 # Other
@@ -141,6 +144,17 @@
 %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
@@ -179,6 +193,8 @@
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
+%patch100 -p1 -b .ansi
+
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -286,9 +302,6 @@
 %{_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
-%if %{with_pa}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
-%endif
 %{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
@@ -364,6 +377,12 @@
 %{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
 %endif
 
+%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
@@ -401,10 +420,9 @@
 
 
 %changelog
-* Fri Aug 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
+* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
 - xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231)
 - Obsoletes: -arts (f9+)
-- move -pulseaudio into main pkg
 
 * Sun Apr 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.12-3
 - rebuild for new ImageMagick (6.4.0.10)