rpms/xine-lib/EL-6 xine-lib.spec,1.81,1.82

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15455

Modified Files:
	xine-lib.spec 
Log Message:
a few more el-6 fixes



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-6/xine-lib.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- xine-lib.spec	21 Jun 2010 15:35:39 -0000	1.81
+++ xine-lib.spec	21 Jun 2010 17:24:30 -0000	1.82
@@ -13,15 +13,10 @@
 %endif # ix86
 
 %if 0%{?fedora}
-%define _enable_v4l  --enable-v4l --enable-libv4l 
 %define _disable_gnomevfs --disable-gnomevfs
 %define with_aalib  %{?_without_aalib:0}%{!?_without_aalib: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_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
-%define with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif # Fedora
 
 %if 0%{?rhel} > 5
@@ -31,7 +26,10 @@
 %endif
 
 %if 0%{?fedora} > 8 || 0%{?rhel} > 5
+%define _enable_v4l  --enable-v4l --enable-libv4l
 %define _without_arts --without-arts
+%define _with_pa  %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+%define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} 
 %endif
 
 %if 0%{?fedora} > 11
@@ -79,7 +77,7 @@ BuildRequires:  libGLU-devel
 %if 0%{?_enable_v4l:1}
 BuildRequires:  libv4l-devel
 %endif
-%if %{with_xcb}
+%if 0%{?_with_xcb:1}
 BuildRequires:  libxcb-devel
 %endif # xcb
 # Video
@@ -107,7 +105,7 @@ BuildRequires:  jack-audio-connection-ki
 BuildRequires:  libmodplug-devel
 BuildRequires:  libmpcdec-devel
 BuildRequires:  libvorbis-devel
-%if %{with_pa}
+%if 0%{?_with_pa:1}
 BuildRequires:  pulseaudio-lib-devel
 %endif # pa
 BuildRequires:  speex-devel
@@ -386,7 +384,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
 %endif # vidix
-%if %{with_xcb}
+%if 0%{?_with_xcb:1}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
 %endif # xcb
@@ -396,7 +394,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
 
-%if %{with_pa}
+%if 0%{?_with_pa:1}
 %if ! 0%{?pa_in_main}
 %files pulseaudio
 %defattr(-,root,root,-)
@@ -404,7 +402,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
 %endif
 
-
 %if 0%{!?_without_arts:1}
 %files arts
 %defattr(-,root,root,-)