rpms/xine-lib/devel xine-lib.spec,1.77,1.78

[Rex Dieter]

Author: rdieter

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

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-5
- move -pulseaudio into main pkg (f12+)
- update URL



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- xine-lib.spec	27 Jul 2009 08:05:29 -0000	1.77
+++ xine-lib.spec	30 Nov 2009 02:08:09 -0000	1.78
@@ -23,17 +23,21 @@
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif # Fedora
 
-%if 0%{?fedora} > 8
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
 %define _without_arts --without-arts
 %endif
 
+%if 0%{?fedora} > 11
+%define pa_in_main 1
+%endif
+
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
-URL:            http://xinehq.de/
+URL:            http://www.xine-project.org/ 
 # The tarball is generated from the upstream tarball using
 # the script in SOURCE1. It prunes potentially patented code
 #Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
@@ -115,6 +119,11 @@ BuildRequires:  samba-common
 %endif
 BuildRequires:  libdvdnav-devel
 
+%if 0%{?pa_in_main}
+Obsoletes: xine-lib-pulseaudio < 1.1.16.3-5
+Provides:  xine-lib-pulseaudio = %{version}-%{release}
+%endif
+
 %description
 This package contains the Xine library.  It can be used to play back
 various media, decode multimedia files from local disk drives, and display
@@ -146,8 +155,6 @@ This package contains the aRts plugin fo
 Summary:        Pulseaudio plugin for %{name} 
 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 %{name}.
@@ -378,18 +385,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
 
-%if 0%{!?_without_arts:1}
-%files arts
-%defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
-%endif
-
 %if %{with_pa}
+%if ! 0%{?pa_in_main}
 %files pulseaudio
 %defattr(-,root,root,-)
+%endif
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
 %endif
 
+
+%if 0%{!?_without_arts:1}
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
+%endif
+
 %files extras
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so
@@ -425,6 +435,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-5
+- move -pulseaudio into main pkg (f12+)
+- update URL
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.16.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild