rpms/xine-lib/F-9 xine-lib.spec,1.46,1.47

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837/F-9

Modified Files:
	xine-lib.spec 
Log Message:
enable caca for f10+ only



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xine-lib.spec	7 Jan 2009 21:03:28 -0000	1.46
+++ xine-lib.spec	7 Jan 2009 21:17:13 -0000	1.47
@@ -13,14 +13,16 @@
     %define     have_vidix  0
 %endif # ix86
 
+%if 0%{?fedora} > 9
+%define _with_caca --with-caca 
+%endif
+
 %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
@@ -67,7 +69,7 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -168,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
+%if 0%{?with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -225,6 +227,7 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
+    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -398,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}